diff --git a/CHANGELOG.md b/CHANGELOG.md
index 278fbf82842..d4bd2422afb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 # June 2024
 
+## General
+
+- Some classloading issues with stubs were fixed.
+
 ## com.mbeddr.mpsutil
 
 ### Deprecated
@@ -132,6 +136,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 - The comparator language now supports a diff tool that can be activated through the `show diff` checkbox.
 
+## Changes
+
+- The interface `IIsDocumentationComment` is now integrated into the MPS TODO window and the old mbeddr todo viewer was completely removed.
+
 # March 2024
 
 ## com.mbeddr.mpsutil
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000..8855cdd0a34
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+mps-support@itemis.de.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/README.md b/README.md
index 17b96a1e1e9..faca49395a8 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ For more details please visit the [mbeddr landing page](https://github.com/mbedd
 
 ### Maven Dependencies
 
-To use mbeddr or the mbeddr platform in your own project, you one of the following dependencies in your maven or gradle build script. The latest support MPS version is 2022.3.1:
+To use mbeddr or the mbeddr platform in your own project, you one of the following dependencies in your maven or gradle build script. The latest support MPS version is 2023.2:
 
 [![mbeddr](https://img.shields.io/badge/Github%20pages-mbeddr-success)](https://github.com/orgs/mbeddr/packages?tab=packages&q=com.mbeddr.mbeddr)
 [![mbeddr platform](https://img.shields.io/badge/Github%20pages-mbeddr.platform-success)](https://github.com/orgs/mbeddr/packages?tab=packages&q=com.mbeddr.platform)
@@ -37,7 +37,8 @@ To use mbeddr or the mbeddr platform in your own project, you one of the followi
 
 | MPS version | nexus status | 
 | --------------- | --------------- |
-| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | 
+| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | 
+| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | 
 | 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | 
 | 2021.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | 
 | 2021.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | 
diff --git a/build-allScripts.xml b/build-allScripts.xml
index 9ba0b66ed72..7bb3df623cd 100644
--- a/build-allScripts.xml
+++ b/build-allScripts.xml
@@ -34,7 +34,7 @@
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
     <fileset dir="${artifacts.mps}/lib">
-      <include name="util.jar" />
+      <include name="util-8.jar" />
     </fileset>
   </path>
   
@@ -596,8 +596,10 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
       <library file="${artifacts.mps}/languages/mps-stubs.jar" />
       <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
       <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
@@ -607,6 +609,7 @@
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.findUsages.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.api.jar" />
+      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.constraints.rules.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.context.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.legacy-constraints.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
@@ -615,6 +618,7 @@
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.refactoring.runtime.jar" />
       <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
       <library file="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
+      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.builder.jar" />
       <library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.java.stub.jar" />
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
@@ -662,17 +666,21 @@
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
         <fileset file="${artifacts.mps}/lib/util.jar" />
         <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
         <fileset file="${artifacts.mps}/lib/java-impl.jar" />
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.de.itemis.mps.extensions}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-execution-configurations/languages/mps-execution-configurations/jetbrains.mps.execution.configurations.implementation.plugin.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-execution-configurations/languages/jetbrains.mps.execution.configurations.implementation.plugin.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/com.mbeddr.allScripts">
diff --git a/build.gradle b/build.gradle
index 8da7ee19173..dbdfbb34c9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ import de.itemis.mps.gradle.RunAntScript
 
 
 plugins {
-    id 'de.itemis.mps.gradle.common' version '1.16.+'
-    id 'download-jbr' version '1.16.+'
+    id 'de.itemis.mps.gradle.common' version '1.22.+'
+    id 'download-jbr' version '1.22.+'
 }
 
 repositories {
@@ -12,15 +12,15 @@ repositories {
 }
 
 downloadJbr {
-    jbrVersion = '17.0.6-b653.34'
+    jbrVersion = '17.0.8.1-b1000.32'
 }
 
 ext.defaultSnapshotRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-snapshots/'
 ext.defaultReleaseRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-releases/'
 
 //MPS version
-ext.mpsMajor = "2022.3"
-ext.mpsBuild = "2022.3.2"
+ext.mpsMajor = "2023.2"
+ext.mpsBuild = "2023.2"
 
 //MPS-extensions version
 ext.mpsExtensionsVersion = findNonEmptyProperty('mpsExtensionsVersion') ?: "$mpsMajor.+"
diff --git a/code/applications/HeartBleed/.mps/migration.xml b/code/applications/HeartBleed/.mps/migration.xml
index 928262b14ea..81b873e7043 100644
--- a/code/applications/HeartBleed/.mps/migration.xml
+++ b/code/applications/HeartBleed/.mps/migration.xml
@@ -13,6 +13,13 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" 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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd b/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd
index 9ddd0a036a3..51ee3be0876 100644
--- a/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="HeartBleed.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#HeartBleed.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="HeartBleed.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#HeartBleed.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/HeartBleed/_spreferences/PlatformTemplates/models/HeartBleed/__spreferences/PlatformTemplates.mps b/code/applications/HeartBleed/_spreferences/PlatformTemplates/models/HeartBleed/__spreferences/PlatformTemplates.mps
index f1ae4b015f9..9b00642ae76 100644
--- a/code/applications/HeartBleed/_spreferences/PlatformTemplates/models/HeartBleed/__spreferences/PlatformTemplates.mps
+++ b/code/applications/HeartBleed/_spreferences/PlatformTemplates/models/HeartBleed/__spreferences/PlatformTemplates.mps
@@ -23,12 +23,12 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd b/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd
index 10091b9ecea..f22d64e2f03 100644
--- a/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="HeartBleed.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#HeartBleed.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="HeartBleed.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#HeartBleed.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd
index 8faa293b950..deddbec2359 100644
--- a/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="HeartBleed.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#HeartBleed.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="HeartBleed.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#HeartBleed.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/HeartBleed/solutions/NewSolution.msd b/code/applications/HeartBleed/solutions/NewSolution.msd
index baa4fc5ea13..4a11edf5c9e 100644
--- a/code/applications/HeartBleed/solutions/NewSolution.msd
+++ b/code/applications/HeartBleed/solutions/NewSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="HeartBleedImpl" uuid="1d9e6da7-9a83-410c-b177-32cc0c2e3c03" moduleVersion="0" compileInMPS="true">
+<solution name="HeartBleedImpl" uuid="1d9e6da7-9a83-410c-b177-32cc0c2e3c03" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:5d09074f-babf-4f2b-b78b-e9929af0f3be:com.mbeddr.analyses.base" version="0" />
     <language slang="l:6ded8a47-f30e-4acf-a5f2-a70ec5472558:com.mbeddr.analyses.base.verification_conditions" version="0" />
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/HeartBleed/solutions/models/HearBleedImpl/Model1.mps b/code/applications/HeartBleed/solutions/models/HearBleedImpl/Model1.mps
index 7262b39508b..f78c76f1276 100644
--- a/code/applications/HeartBleed/solutions/models/HearBleedImpl/Model1.mps
+++ b/code/applications/HeartBleed/solutions/models/HearBleedImpl/Model1.mps
@@ -13,7 +13,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -67,7 +67,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -97,7 +97,7 @@
         <child id="8985851583396455257" name="varRef" index="2c3wGY" />
       </concept>
       <concept id="8985851583396455243" name="com.mbeddr.analyses.cbmc.structure.HarnessModule" flags="ng" index="2c3wGG" />
-      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ng" index="2lUzGJ">
+      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ngI" index="2lUzGJ">
         <property id="8327535879610783176" name="timeoutInSeconds" index="2l50Ka" />
         <property id="8327535879610783188" name="timeoutForSingleAnalysis" index="2l50Km" />
         <property id="8327535879610783060" name="sliceFormula" index="2l50Mm" />
@@ -134,7 +134,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -155,7 +155,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -163,7 +163,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -190,7 +190,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -225,7 +225,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="595416243537320771" name="com.mbeddr.core.expressions.structure.UnsignedShortType" flags="ng" index="LMkMC" />
diff --git a/code/applications/IntegratedCExample/.mps/migration.xml b/code/applications/IntegratedCExample/.mps/migration.xml
index 14d993aa567..65858d6beb2 100644
--- a/code/applications/IntegratedCExample/.mps/migration.xml
+++ b/code/applications/IntegratedCExample/.mps/migration.xml
@@ -14,10 +14,17 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" 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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.name2id_gen_perroot" value="executed" />
     <entry key="jetbrains.mps.obsoletePropsCleanup" value="executed" />
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd b/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd
index 3c0df2e9968..4dd798cb39c 100644
--- a/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="IntegratedCExample.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#IntegratedCExample.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="IntegratedCExample.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#IntegratedCExample.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/models/IntegratedCExample/__spreferences/PlatformTemplates.mps b/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/models/IntegratedCExample/__spreferences/PlatformTemplates.mps
index bf38f3d5dbe..0409ef07980 100644
--- a/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/models/IntegratedCExample/__spreferences/PlatformTemplates.mps
+++ b/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/models/IntegratedCExample/__spreferences/PlatformTemplates.mps
@@ -21,12 +21,12 @@
         <property id="8774011376396215812" name="linker" index="18_EFo" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd b/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd
index dc6344e6736..1324c0ed42b 100644
--- a/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="IntegratedCExample.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#IntegratedCExample.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="IntegratedCExample.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#IntegratedCExample.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd
index c6f76dc1f37..503fd0e043a 100644
--- a/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="IntegratedCExample.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#IntegratedCExample.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="IntegratedCExample.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#IntegratedCExample.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl
index 656e7261d72..3e77cb232f3 100644
--- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl
+++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl
@@ -44,7 +44,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -110,12 +110,10 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)</dependency>
@@ -125,7 +123,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -208,7 +206,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</extendedLanguage>
diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/generator/template/main@generator.mps b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/generator/template/main@generator.mps
index b48176766fd..c3dc6d3daf2 100644
--- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/generator/template/main@generator.mps
+++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/generator/template/main@generator.mps
@@ -103,14 +103,14 @@
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -186,12 +186,12 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/behavior.mps b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/behavior.mps
index 202f835e9d0..80bcaaa5bcc 100644
--- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/behavior.mps
+++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/behavior.mps
@@ -57,7 +57,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -76,7 +76,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/constraints.mps b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/constraints.mps
index 54f20dcbbb8..52e85c0004d 100644
--- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/constraints.mps
+++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/constraints.mps
@@ -53,7 +53,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -83,6 +83,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -121,7 +122,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -129,7 +130,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
         <child id="1225711182005" name="list" index="1y566C" />
@@ -181,7 +181,7 @@
                           <node concept="2OqwBi" id="7iLD7IQnP5C" role="3uHU7B">
                             <node concept="2OqwBi" id="7iLD7IQnKxj" role="2Oq$k0">
                               <node concept="37vLTw" id="7iLD7IQnKaK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7iLD7IQn7Wh" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1nt" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="7iLD7IQnLUM" role="2OqNvi">
                                 <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
@@ -200,7 +200,7 @@
                             </node>
                             <node concept="2OqwBi" id="7iLD7IQn_eP" role="1y566C">
                               <node concept="37vLTw" id="7iLD7IQn$PT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7iLD7IQn7Wh" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1nt" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="7iLD7IQnACb" role="2OqNvi">
                                 <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
@@ -252,9 +252,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7iLD7IQn7Wh" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1nt" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7iLD7IQn7Wi" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1nu" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -310,7 +310,7 @@
                           <node concept="2OqwBi" id="7iLD7IQq_kB" role="3uHU7B">
                             <node concept="2OqwBi" id="7iLD7IQq_kC" role="2Oq$k0">
                               <node concept="37vLTw" id="7iLD7IQq_kD" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7iLD7IQq_cf" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1nv" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="7iLD7IQq_kE" role="2OqNvi">
                                 <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
@@ -329,7 +329,7 @@
                             </node>
                             <node concept="2OqwBi" id="7iLD7IQq_kK" role="1y566C">
                               <node concept="37vLTw" id="7iLD7IQq_kL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7iLD7IQq_cf" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1nv" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="7iLD7IQq_kM" role="2OqNvi">
                                 <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
@@ -381,9 +381,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7iLD7IQq_cf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1nv" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7iLD7IQq_cg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1nw" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/editor.mps b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/editor.mps
index 82683d7604a..a75bc85f8ee 100644
--- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/editor.mps
+++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/editor.mps
@@ -20,7 +20,7 @@
       <concept id="1402906326896143883" name="jetbrains.mps.lang.editor.structure.CellKeyMap_FunctionParm_selectedNode" flags="nn" index="0GJ7k" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -65,7 +65,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -100,7 +100,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -196,7 +196,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -276,7 +276,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/intentions.mps b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/intentions.mps
index 8a7fd32ac13..6acbe9f0d55 100644
--- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/intentions.mps
+++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/intentions.mps
@@ -55,7 +55,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -91,7 +91,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps
index 654b1df9561..2f64e3e7a1c 100644
--- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps
+++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps
@@ -66,7 +66,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd
index e1ebd119edd..a947d5dd20c 100644
--- a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd
+++ b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="EmbeddedProgram" uuid="3982e453-568f-4861-b238-02cd967db195" moduleVersion="0" compileInMPS="true">
+<solution name="EmbeddedProgram" uuid="3982e453-568f-4861-b238-02cd967db195" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:442192fc-0a8e-4f77-b358-f47f229809d1:DomainSpecificLanguage" version="0" />
     <language slang="l:5d09074f-babf-4f2b-b78b-e9929af0f3be:com.mbeddr.analyses.base" version="0" />
@@ -50,7 +49,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main.mps b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main.mps
index 12f7650cd50..777c6019d69 100644
--- a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main.mps
+++ b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main.mps
@@ -34,7 +34,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -94,7 +94,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -142,7 +142,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -156,7 +156,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -164,7 +164,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -190,7 +190,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -211,7 +211,7 @@
       </concept>
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm.mps b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm.mps
index 87768d91619..6bf6b7a272d 100644
--- a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm.mps
+++ b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm.mps
@@ -35,7 +35,7 @@
         <child id="3134547887598498471" name="body" index="gg_gl" />
         <child id="3134547887598498479" name="condition" index="gg_gt" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -95,7 +95,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -143,7 +143,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -157,7 +157,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -165,7 +165,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -231,7 +231,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -252,7 +252,7 @@
       </concept>
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller.mps b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller.mps
index eecbb78109d..fda66bde796 100644
--- a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller.mps
+++ b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller.mps
@@ -36,7 +36,7 @@
         <child id="3134547887598498471" name="body" index="gg_gl" />
         <child id="3134547887598498479" name="condition" index="gg_gt" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -96,7 +96,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -144,7 +144,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -158,7 +158,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -166,7 +166,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -253,7 +253,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -274,7 +274,7 @@
       </concept>
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller_dectab_math.mps b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller_dectab_math.mps
index 778ecc9a5c4..a9e61c6fdba 100644
--- a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller_dectab_math.mps
+++ b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/main_sm_controller_dectab_math.mps
@@ -32,7 +32,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -91,7 +91,7 @@
       <concept id="7171543680058566278" name="com.mbeddr.core.buildconfig.structure.ExternalLibraries" flags="ng" index="1A$dpX">
         <child id="8849280731830394219" name="libraries" index="3gIQyr" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -145,7 +145,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -166,7 +166,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -174,7 +174,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -284,7 +284,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -304,7 +304,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/presentation.mps b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/presentation.mps
index fcaf5be2750..18e23761464 100644
--- a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/presentation.mps
+++ b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/models/presentation.mps
@@ -28,7 +28,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="126932837435370865" name="authors" index="Wq1Bf" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
@@ -77,7 +77,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -121,7 +121,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/Pacemaker/.mps/migration.xml b/code/applications/Pacemaker/.mps/migration.xml
index 928262b14ea..81b873e7043 100644
--- a/code/applications/Pacemaker/.mps/migration.xml
+++ b/code/applications/Pacemaker/.mps/migration.xml
@@ -13,6 +13,13 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" 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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd b/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd
index ec8d33b5a62..367e32ede6b 100644
--- a/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.fortiss.pacemakermodel.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#org.fortiss.pacemakermodel.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="org.fortiss.pacemakermodel.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#org.fortiss.pacemakermodel.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/Pacemaker/_spreferences/PlatformTemplates/models/org/fortiss/pacemakermodel/__spreferences/PlatformTemplates.mps b/code/applications/Pacemaker/_spreferences/PlatformTemplates/models/org/fortiss/pacemakermodel/__spreferences/PlatformTemplates.mps
index 55e42759307..1ce970a6718 100644
--- a/code/applications/Pacemaker/_spreferences/PlatformTemplates/models/org/fortiss/pacemakermodel/__spreferences/PlatformTemplates.mps
+++ b/code/applications/Pacemaker/_spreferences/PlatformTemplates/models/org/fortiss/pacemakermodel/__spreferences/PlatformTemplates.mps
@@ -21,12 +21,12 @@
         <property id="8774011376396215812" name="linker" index="18_EFo" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd b/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd
index d36f18eb5e0..f19ca80ed66 100644
--- a/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.fortiss.pacemakermodel.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#org.fortiss.pacemakermodel.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="org.fortiss.pacemakermodel.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#org.fortiss.pacemakermodel.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd
index 09d4391c7e9..73f70c69ecb 100644
--- a/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.fortiss.pacemakermodel.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#org.fortiss.pacemakermodel.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="org.fortiss.pacemakermodel.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#org.fortiss.pacemakermodel.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps b/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps
index a96215b350f..ccf3f19b476 100644
--- a/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps
+++ b/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps
@@ -12,7 +12,7 @@
   <imports />
   <registry>
     <language id="53bab999-e9c3-428a-80be-fef5bed08f55" name="com.mbeddr.cc.trace">
-      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ng" index="FamN3">
+      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ngI" index="FamN3">
         <child id="4577779292081946445" name="refs" index="Fanle" />
         <child id="4577779292081946444" name="tracekind" index="Fanlf" />
       </concept>
@@ -41,7 +41,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -91,12 +91,12 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136472795" name="com.mbeddr.doc.structure.PathDefinition" flags="ng" index="2SbYGw">
@@ -109,7 +109,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
     </language>
@@ -148,7 +148,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -170,7 +170,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -178,7 +178,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -287,7 +287,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -312,7 +312,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd b/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd
index e2ed4e63388..e7d83e64f12 100644
--- a/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd
+++ b/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="pacemakermodel" uuid="ece3e9d8-9bef-4512-a27b-88687ccf6cd6" moduleVersion="0" compileInMPS="true">
+<solution name="pacemakermodel" uuid="ece3e9d8-9bef-4512-a27b-88687ccf6cd6" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:5d09074f-babf-4f2b-b78b-e9929af0f3be:com.mbeddr.analyses.base" version="0" />
     <language slang="l:6ded8a47-f30e-4acf-a5f2-a70ec5472558:com.mbeddr.analyses.base.verification_conditions" version="0" />
@@ -58,7 +57,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.build-examples/.mps/migration.xml b/code/applications/com.mbeddr.build-examples/.mps/migration.xml
index b3e1ff3ac12..81b873e7043 100644
--- a/code/applications/com.mbeddr.build-examples/.mps/migration.xml
+++ b/code/applications/com.mbeddr.build-examples/.mps/migration.xml
@@ -15,7 +15,11 @@
     <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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="222" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
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 7fbd63657e2..c9ee5643732 100644
--- a/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.build-examples.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.build-examples.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.build-examples.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.build-examples.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/models/com/mbeddr/build-examples/__spreferences/PlatformTemplates.mps b/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/models/com/mbeddr/build-examples/__spreferences/PlatformTemplates.mps
index d8967c5b81c..917e55caac4 100644
--- a/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/models/com/mbeddr/build-examples/__spreferences/PlatformTemplates.mps
+++ b/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/models/com/mbeddr/build-examples/__spreferences/PlatformTemplates.mps
@@ -22,12 +22,12 @@
         <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd b/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd
index 3e043393307..3fb27a92972 100644
--- a/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.build-examples.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.build-examples.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.build-examples.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.build-examples.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd
index 91b2ab53598..606f97f8fd9 100644
--- a/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.build-examples.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.build-examples.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.build-examples.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.build-examples.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/com.baselanguage.unless.mpl b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/com.baselanguage.unless.mpl
index 7deded02bf9..b07b6eb1724 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/com.baselanguage.unless.mpl
+++ b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/com.baselanguage.unless.mpl
@@ -28,7 +28,7 @@
         <language slang="l:a6c9731c-e688-447f-8d50-3cf76b24e87d:com.baselanguage.unless" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -57,7 +57,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
@@ -66,7 +65,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/generator/template/main@generator.mps b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/generator/template/main@generator.mps
index f1765f3c33e..97e80ba481b 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/generator/template/main@generator.mps
+++ b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/generator/template/main@generator.mps
@@ -72,7 +72,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/editor.mps b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/editor.mps
index 78b01d5a975..27f3dc9af52 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/editor.mps
+++ b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/editor.mps
@@ -23,7 +23,7 @@
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -36,7 +36,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/structure.mps b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/structure.mps
index 9c0ca43d786..dfff5ae32aa 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/structure.mps
+++ b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="e840b8ae-64d9-4b5b-b3b4-eca3f222d4da" name="com.mbeddr.mpsutil.iconchar" version="1" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
@@ -48,7 +48,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/com.baselanguage.unless.sandbox.msd b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/com.baselanguage.unless.sandbox.msd
index 0e5afda5f51..417df8336e6 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/com.baselanguage.unless.sandbox.msd
+++ b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/com.baselanguage.unless.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.baselanguage.unless.sandbox" uuid="72af620b-9206-497f-b7d6-60b014ce425f" moduleVersion="0" compileInMPS="true">
+<solution name="com.baselanguage.unless.sandbox" uuid="72af620b-9206-497f-b7d6-60b014ce425f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,13 +10,12 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:a6c9731c-e688-447f-8d50-3cf76b24e87d:com.baselanguage.unless" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/models/com/baselanguage/unless/sandbox.mps b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/models/com/baselanguage/unless/sandbox.mps
index 57398d52d78..eb7cc302869 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/models/com/baselanguage/unless/sandbox.mps
+++ b/code/applications/com.mbeddr.build-examples/languages/com.baselanguage.unless/sandbox/models/com/baselanguage/unless/sandbox.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="a6c9731c-e688-447f-8d50-3cf76b24e87d" name="com.baselanguage.unless" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" 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" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -25,7 +25,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -51,7 +51,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl
index de133ae4b8b..cb3210f9d78 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl
+++ b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl
@@ -37,7 +37,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -96,7 +96,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</dependency>
   </dependencies>
@@ -104,7 +103,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/generator/template/main@generator.mps b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/generator/template/main@generator.mps
index f96bd0dcab2..e2651b9f6ff 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/generator/template/main@generator.mps
+++ b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/generator/template/main@generator.mps
@@ -73,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/editor.mps b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/editor.mps
index 1cf8b88c9ed..08a8ab92894 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/editor.mps
+++ b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/editor.mps
@@ -21,7 +21,7 @@
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -34,7 +34,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/structure.mps b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/structure.mps
index fc3d57e005f..08c1bd80d48 100644
--- a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/structure.mps
+++ b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/models/structure.mps
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml
index 69c89751b92..8fb82bb0cc5 100644
--- a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml
+++ b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml
@@ -39,7 +39,7 @@
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
     <fileset dir="${artifacts.mps}/lib">
-      <include name="util.jar" />
+      <include name="util-8.jar" />
     </fileset>
   </path>
   
@@ -272,6 +272,7 @@
       <settings refid="m2m-0" />
       <plugin path="${artifacts.mps}/lib/mps-workbench.jar" />
       <plugin path="${artifacts.mps}/plugins/mps-build" />
+      <plugin path="${artifacts.mps}/plugins/mps-console" />
       <plugin path="${artifacts.mps}/plugins/mps-core" />
       <plugin path="${artifacts.mps}/plugins/mps-debugger-api" />
       <plugin path="${artifacts.mps}/plugins/mps-execution-api" />
@@ -346,6 +347,7 @@
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.rules.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.rulesAndMessages.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
@@ -465,11 +467,11 @@
         <path location="${unless.home}/languages/com.baselanguage.unless/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.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" />
@@ -479,10 +481,8 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -492,14 +492,18 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
         <fileset file="${artifacts.mps}/lib/util.jar" />
         <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
         <fileset file="${artifacts.mps}/lib/java-impl.jar" />
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -522,11 +526,11 @@
         <path location="${unless.home}/languages/com.baselanguage.unless/generator/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.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" />
@@ -536,10 +540,8 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -550,14 +552,18 @@
         <pathelement path="${build.tmp}/java/out/com.baselanguage.unless" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
         <fileset file="${artifacts.mps}/lib/util.jar" />
         <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
         <fileset file="${artifacts.mps}/lib/java-impl.jar" />
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd
index 93b933cc9c6..e7eb85ee162 100644
--- a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd
+++ b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.baselanguage.unless.build" uuid="adc0e22a-8d8a-44e9-bc6e-2a1030a0c51a" moduleVersion="0" compileInMPS="true">
+<solution name="com.baselanguage.unless.build" uuid="adc0e22a-8d8a-44e9-bc6e-2a1030a0c51a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps
index c4c0bc8bfee..054d3be65ea 100644
--- a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps
+++ b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps
@@ -57,7 +57,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
@@ -73,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd b/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd
index 9e819d1a30c..12ce78f5e1d 100644
--- a/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd
+++ b/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.unless.sandbox" uuid="b7599586-805b-4d7d-b326-a4665b86b3b8" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.unless.sandbox" uuid="b7599586-805b-4d7d-b326-a4665b86b3b8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -41,7 +40,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/models/com/mbeddr/unless/sandbox/main.mps b/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/models/com/mbeddr/unless/sandbox/main.mps
index 169bc8f6795..aea00c2f8c0 100644
--- a/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/models/com/mbeddr/unless/sandbox/main.mps
+++ b/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/models/com/mbeddr/unless/sandbox/main.mps
@@ -41,7 +41,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -52,7 +52,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -81,12 +81,12 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/com.mbeddr.documentation/.mps/migration.xml b/code/applications/com.mbeddr.documentation/.mps/migration.xml
index 41f714fad8e..f2bdcb6c621 100644
--- a/code/applications/com.mbeddr.documentation/.mps/migration.xml
+++ b/code/applications/com.mbeddr.documentation/.mps/migration.xml
@@ -16,11 +16,18 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" 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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.name2id_gen_perroot" value="executed" />
     <entry key="jetbrains.mps.obsoletePropsCleanup" value="executed" />
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd
index 0b973940033..7287b9f5ecc 100644
--- a/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.documentation.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.documentation.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.documentation.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.documentation.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/models/com/mbeddr/documentation/__spreferences/PlatformTemplates.mps b/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/models/com/mbeddr/documentation/__spreferences/PlatformTemplates.mps
index ff19c8f9a86..0028fe87526 100644
--- a/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/models/com/mbeddr/documentation/__spreferences/PlatformTemplates.mps
+++ b/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/models/com/mbeddr/documentation/__spreferences/PlatformTemplates.mps
@@ -23,12 +23,12 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd b/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd
index 605d3b4dec9..eff4ab42b2e 100644
--- a/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.documentation.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.documentation.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.documentation.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.documentation.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd
index 63620b8eefa..58d8f413225 100644
--- a/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.documentation.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.documentation.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.documentation.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.documentation.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
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 005eeeae7ba..96e261cde13 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.interpreter.documentation" uuid="443ce42a-2414-4193-a304-b4922e4d0b6c" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.interpreter.documentation" uuid="443ce42a-2414-4193-a304-b4922e4d0b6c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
@@ -59,7 +58,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <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" />
@@ -131,7 +130,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
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 836505f1782..daff1023471 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
@@ -7,7 +7,7 @@
     <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="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="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
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 22fed918677..04056686fd0 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
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <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="1" />
@@ -199,6 +199,7 @@
       <concept id="4208238404719201400" name="com.mbeddr.doc.structure.NameAnnotation" flags="ng" index="1h5QrK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -269,7 +270,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
@@ -756,7 +756,7 @@
                       <node concept="3clFbF" id="1Y3rEQ3oS_t" role="3cqZAp">
                         <node concept="3SLO07" id="1Y3rEQ3oS_r" role="3clFbG">
                           <node concept="37vLTw" id="1Y3rEQ3oSC7" role="3SLO0q">
-                            <ref role="3cqZAo" node="1Y3rEQ3oSxT" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2uC" resolve="it" />
                           </node>
                           <node concept="1h5QrK" id="1Y3rEQ3oVVa" role="lGtFl">
                             <property role="TrG5h" value="isEvaluableExpression" />
@@ -764,9 +764,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1Y3rEQ3oSxT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2uC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1Y3rEQ3oSxU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2uD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/applications/com.mbeddr.embedded/.mps/migration.xml b/code/applications/com.mbeddr.embedded/.mps/migration.xml
index c1e374c0297..98ddf186e6e 100644
--- a/code/applications/com.mbeddr.embedded/.mps/migration.xml
+++ b/code/applications/com.mbeddr.embedded/.mps/migration.xml
@@ -10,9 +10,16 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" 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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.name2id_gen_perroot" value="executed" />
     <entry key="jetbrains.mps.obsoletePropsCleanup" value="executed" />
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd
index b7f26b21539..7b513eb9db6 100644
--- a/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.embedded.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.embedded.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.embedded.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.embedded.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/models/com/mbeddr/embedded/__spreferences/PlatformTemplates.mps b/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/models/com/mbeddr/embedded/__spreferences/PlatformTemplates.mps
index f7d3786ae0d..487557bce4e 100644
--- a/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/models/com/mbeddr/embedded/__spreferences/PlatformTemplates.mps
+++ b/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/models/com/mbeddr/embedded/__spreferences/PlatformTemplates.mps
@@ -22,12 +22,12 @@
         <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd b/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd
index f6361bb41c3..5d9549717cf 100644
--- a/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.embedded.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.embedded.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.embedded.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.embedded.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd
index 716344b6f36..c6253f68da5 100644
--- a/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.embedded.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.embedded.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.embedded.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.embedded.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl
index 75a0170c316..6a9e27a60f8 100644
--- a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl
+++ b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl
@@ -54,7 +54,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -124,7 +124,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_together">
@@ -144,7 +143,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
@@ -181,7 +179,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -261,7 +259,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</extendedLanguage>
diff --git a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/generator/template/main@generator.mps b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/generator/template/main@generator.mps
index a5d6480dd9e..4d1405cdd37 100644
--- a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/generator/template/main@generator.mps
+++ b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/generator/template/main@generator.mps
@@ -96,7 +96,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
       <concept id="745648737914844472" name="com.mbeddr.core.statements.structure.AnyNodeItem" flags="ng" index="2sYeqF">
         <child id="745648737914844473" name="theNode" index="2sYeqE" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -131,7 +131,7 @@
         <property id="1927508255679918010" name="header" index="3bOcOL" />
         <property id="5485104033529954231" name="text" index="3IwBUT" />
       </concept>
-      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ng" index="3O7dYF">
+      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ngI" index="3O7dYF">
         <child id="605413736672002881" name="prefixes" index="3O7dZk" />
       </concept>
       <concept id="1679452829930336984" name="com.mbeddr.core.statements.structure.CommentStatement" flags="ng" index="1QiMYF">
@@ -185,7 +185,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -232,6 +232,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -324,14 +325,14 @@
       <concept id="6512473996287153137" name="com.mbeddr.core.modules.structure.Section" flags="ng" index="fMItD">
         <child id="6512473996287153139" name="contents" index="fMItF" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -342,7 +343,7 @@
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -425,7 +426,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -441,7 +442,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -472,7 +473,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -2886,7 +2886,7 @@
                               <node concept="3clFbF" id="5usoWIJ3jLs" role="3cqZAp">
                                 <node concept="2OqwBi" id="5usoWIJ3jUA" role="3clFbG">
                                   <node concept="37vLTw" id="5usoWIJ3jLr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5usoWIJ3jqN" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1nB" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="5usoWIJ3k_X" role="2OqNvi">
                                     <ref role="3TsBF5" to="k146:2lgwE2U38zk" resolve="active" />
@@ -2894,9 +2894,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5usoWIJ3jqN" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1nB" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5usoWIJ3jqO" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1nC" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3041,14 +3041,14 @@
                                     <ref role="3TsBF5" to="k146:5oFMniD7jqL" resolve="count" />
                                   </node>
                                   <node concept="37vLTw" id="5usoWIJ2LVE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5usoWIJ2LVF" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1nD" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5usoWIJ2LVF" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1nD" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5usoWIJ2LVG" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1nE" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/behavior.mps b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/behavior.mps
index 7ef968f4391..029fa2321e5 100644
--- a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/behavior.mps
+++ b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/behavior.mps
@@ -87,16 +87,17 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -143,7 +144,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -165,7 +166,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -372,7 +372,7 @@
                           <ref role="1Pybhc" to="qd6m:7oI7FI6rWpL" resolve="ModuleContentDepHelper" />
                           <ref role="37wK5l" to="qd6m:7oI7FI6rWpR" resolve="dependenciesForType" />
                           <node concept="37vLTw" id="3BaKq1PUPMR" role="37wK5m">
-                            <ref role="3cqZAo" node="3BaKq1PUvq1" resolve="t" />
+                            <ref role="3cqZAo" node="2SR9xrsN1n$" resolve="t" />
                           </node>
                         </node>
                       </node>
@@ -380,9 +380,9 @@
                   </node>
                   <node concept="3clFbH" id="3BaKq1PXwDN" role="3cqZAp" />
                 </node>
-                <node concept="Rh6nW" id="3BaKq1PUvq1" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1n$" role="1bW2Oz">
                   <property role="TrG5h" value="t" />
-                  <node concept="2jxLKc" id="3BaKq1PUvq2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1n_" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/editor.mps b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/editor.mps
index 96f34b4e67d..4ae36eea7f7 100644
--- a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/editor.mps
+++ b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/editor.mps
@@ -27,7 +27,7 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -41,7 +41,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/structure.mps b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/structure.mps
index c276663f2b4..ad5b5ddd89e 100644
--- a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/structure.mps
+++ b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/languageModels/structure.mps
@@ -40,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd
index 0af3b0a9cb7..e2d65f0d8b3 100644
--- a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd
+++ b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.embedded.platform" uuid="4756a008-77a4-4012-b9b3-117cfb62be8d" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.embedded.platform" uuid="4756a008-77a4-4012-b9b3-117cfb62be8d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -50,7 +49,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/impl.mps b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/impl.mps
index b20f52f5136..19db511e1f5 100644
--- a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/impl.mps
+++ b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/impl.mps
@@ -33,7 +33,7 @@
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
       <concept id="8322694141622975616" name="com.mbeddr.core.statements.structure.WaitBusy" flags="ng" index="2ualET" />
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -52,7 +52,7 @@
         <child id="7254843406768606787" name="condition" index="1_amZB" />
       </concept>
       <concept id="7254843406768606755" name="com.mbeddr.core.statements.structure.ForVarDecl" flags="ng" index="1_amY7" />
-      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ng" index="3O7dYF">
+      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ngI" index="3O7dYF">
         <child id="605413736672002881" name="prefixes" index="3O7dZk" />
       </concept>
       <concept id="1679452829930336984" name="com.mbeddr.core.statements.structure.CommentStatement" flags="ng" index="1QiMYF">
@@ -126,7 +126,7 @@
         <child id="6021475212426185244" name="arguments" index="BULBh" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -134,7 +134,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -161,7 +161,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -221,7 +221,7 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -246,7 +246,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/sdk.mps b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/sdk.mps
index cf023dcb468..a079b5b3677 100644
--- a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/sdk.mps
+++ b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/sdk.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -120,17 +120,17 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -143,7 +143,7 @@
         <reference id="7308356872494660982" name="arg" index="39I4aG" />
       </concept>
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -156,7 +156,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -186,7 +186,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/util.mps b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/util.mps
index 13eca7e09b6..483f4815f66 100644
--- a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/util.mps
+++ b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/ESP8266/util.mps
@@ -19,7 +19,7 @@
         <child id="3134547887598498471" name="body" index="gg_gl" />
         <child id="3134547887598498479" name="condition" index="gg_gt" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -93,7 +93,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -101,7 +101,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -116,7 +116,7 @@
         <reference id="7308356872494660982" name="arg" index="39I4aG" />
       </concept>
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -161,7 +161,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/HAL.mps b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/HAL.mps
index 83c182c969a..dfa47eb215d 100644
--- a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/HAL.mps
+++ b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/models/com/mbeddr/embedded/platform/HAL.mps
@@ -7,7 +7,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
     </language>
@@ -49,17 +49,17 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -68,7 +68,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="5962749441518381743" name="com.mbeddr.core.expressions.structure.BitwiseAndExpression" flags="ng" index="SSPID" />
diff --git a/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd b/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd
index ca5d97133fd..4f2204eb1ed 100644
--- a/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd
+++ b/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="demo.ESP8266.sdcard" uuid="e17f9c06-285d-42c9-ab7d-5a38eefea36c" moduleVersion="0" compileInMPS="true">
+<solution name="demo.ESP8266.sdcard" uuid="e17f9c06-285d-42c9-ab7d-5a38eefea36c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">4756a008-77a4-4012-b9b3-117cfb62be8d(com.mbeddr.embedded.platform)</dependency>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
@@ -52,7 +51,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/models/demo/ESP8266/sdcard/impl.mps b/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/models/demo/ESP8266/sdcard/impl.mps
index a89851fa63c..1543ac16b0b 100644
--- a/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/models/demo/ESP8266/sdcard/impl.mps
+++ b/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/models/demo/ESP8266/sdcard/impl.mps
@@ -21,7 +21,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -40,7 +40,7 @@
         <child id="7254843406768606787" name="condition" index="1_amZB" />
       </concept>
       <concept id="7254843406768606755" name="com.mbeddr.core.statements.structure.ForVarDecl" flags="ng" index="1_amY7" />
-      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ng" index="3O7dYF">
+      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ngI" index="3O7dYF">
         <child id="605413736672002881" name="prefixes" index="3O7dZk" />
       </concept>
       <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf">
@@ -114,7 +114,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -139,7 +139,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -147,7 +147,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -192,7 +192,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -239,7 +239,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/.mps/migration.xml b/code/applications/tutorial-dsls-extensions/.mps/migration.xml
index 9af4b90532d..64a93943bdc 100644
--- a/code/applications/tutorial-dsls-extensions/.mps/migration.xml
+++ b/code/applications/tutorial-dsls-extensions/.mps/migration.xml
@@ -9,5 +9,12 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" 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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd b/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd
index aa55a701742..760daf7a5fc 100644
--- a/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tutorial-dsls-extensions.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#tutorial-dsls-extensions.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="tutorial-dsls-extensions.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#tutorial-dsls-extensions.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/models/tutorial-dsls-extensions.__spreferences.PlatformTemplates.mps b/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/models/tutorial-dsls-extensions.__spreferences.PlatformTemplates.mps
index 5a03c86e6eb..cc6f03e0439 100644
--- a/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/models/tutorial-dsls-extensions.__spreferences.PlatformTemplates.mps
+++ b/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/models/tutorial-dsls-extensions.__spreferences.PlatformTemplates.mps
@@ -22,12 +22,12 @@
         <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd b/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd
index ee0e5ecf98a..ed36d820358 100644
--- a/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tutorial-dsls-extensions.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#tutorial-dsls-extensions.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="tutorial-dsls-extensions.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#tutorial-dsls-extensions.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd
index 275167115e4..3d7b00a5206 100644
--- a/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl b/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl
index 6ebfbaf82af..18dfa8c78f5 100644
--- a/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl
@@ -43,7 +43,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -106,7 +106,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="07b580a3-cb92-4b5d-ab7c-9e2d58b9d602(mbeddr.tutorial.blocks)" version="0" />
         <module reference="a32979ae-2a0e-4807-a585-82f5cabcad4a(mbeddr.tutorial.blocks#6275956088647057041)" version="0" />
       </dependencyVersions>
@@ -128,12 +127,11 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -207,7 +205,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="07b580a3-cb92-4b5d-ab7c-9e2d58b9d602(mbeddr.tutorial.blocks)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/generator/template/blockdemo/blocks/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/blocks/generator/template/blockdemo/blocks/generator/template/main@generator.mps
index 6e3bdba3452..7dee172835a 100644
--- a/code/applications/tutorial-dsls-extensions/languages/blocks/generator/template/blockdemo/blocks/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/blocks/generator/template/blockdemo/blocks/generator/template/main@generator.mps
@@ -43,7 +43,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -62,7 +62,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -112,6 +112,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -144,7 +145,7 @@
       <concept id="6512473996287153137" name="com.mbeddr.core.modules.structure.Section" flags="ng" index="fMItD">
         <child id="6512473996287153139" name="contents" index="fMItF" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -201,7 +202,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -213,7 +214,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -226,7 +227,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -931,7 +931,7 @@
                                       <node concept="2OqwBi" id="2Pa5ezSkhso" role="3clFbG">
                                         <node concept="2OqwBi" id="2Pa5ezSkhrw" role="2Oq$k0">
                                           <node concept="37vLTw" id="2Pa5ezSkhrb" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2Pa5ezSkhr7" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1nW" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="2Pa5ezSkhrB" role="2OqNvi">
                                             <ref role="3Tt5mk" to="bgic:3NI0$JEbN2T" resolve="impl" />
@@ -945,9 +945,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="2Pa5ezSkhr7" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1nW" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="2Pa5ezSkhr8" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1nX" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/behavior.mps
index 4bde2debf33..79825bd19ed 100644
--- a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/behavior.mps
@@ -74,19 +74,20 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -134,7 +135,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -148,7 +149,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -294,7 +294,7 @@
                     <node concept="3clFbF" id="3NI0$JEbQJU" role="3cqZAp">
                       <node concept="2OqwBi" id="3NI0$JEbQKg" role="3clFbG">
                         <node concept="37vLTw" id="6Jhc0CXtV0P" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3NI0$JEbQJS" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1nF" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3NI0$JEbQKn" role="2OqNvi">
                           <node concept="chp4Y" id="3NI0$JEbQKp" role="cj9EA">
@@ -304,9 +304,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3NI0$JEbQJS" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1nF" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3NI0$JEbQJT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1nG" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -317,7 +317,7 @@
                   <node concept="3clFbF" id="3NI0$JEbQKV" role="3cqZAp">
                     <node concept="1PxgMI" id="3NI0$JEbQLh" role="3clFbG">
                       <node concept="37vLTw" id="6Jhc0CXtV1D" role="1m5AlR">
-                        <ref role="3cqZAo" node="3NI0$JEbQKT" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1nH" resolve="it" />
                       </node>
                       <node concept="chp4Y" id="OnnrMNmSPg" role="3oSUPX">
                         <ref role="cht4Q" to="bgic:3NI0$JEby1z" resolve="Port" />
@@ -325,9 +325,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3NI0$JEbQKT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1nH" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3NI0$JEbQKU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1nI" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -359,7 +359,7 @@
                     <node concept="2OqwBi" id="7wlBVIeF77w" role="3clFbG">
                       <node concept="2OqwBi" id="7wlBVIeF6Eo" role="2Oq$k0">
                         <node concept="37vLTw" id="6Jhc0CXtV1M" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7wlBVIeF6E0" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1nJ" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="7wlBVIeF6Et" role="2OqNvi">
                           <ref role="3TsBF5" to="bgic:115mCuLnE1k" resolve="dir" />
@@ -373,9 +373,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7wlBVIeF6E0" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1nJ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7wlBVIeF6E1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1nK" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -407,7 +407,7 @@
                     <node concept="2OqwBi" id="7wlBVIeF77Q" role="3clFbG">
                       <node concept="2OqwBi" id="7wlBVIeF77R" role="2Oq$k0">
                         <node concept="37vLTw" id="6Jhc0CXtV1a" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7wlBVIeF77W" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1nL" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="7wlBVIeF77T" role="2OqNvi">
                           <ref role="3TsBF5" to="bgic:115mCuLnE1k" resolve="dir" />
@@ -421,9 +421,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7wlBVIeF77W" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1nL" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7wlBVIeF77X" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1nM" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -455,7 +455,7 @@
                     <node concept="3clFbF" id="3NI0$JEbQLx" role="3cqZAp">
                       <node concept="2OqwBi" id="3NI0$JEbQLy" role="3clFbG">
                         <node concept="37vLTw" id="6Jhc0CXtV3t" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3NI0$JEbQLA" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1nN" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3NI0$JEbQL$" role="2OqNvi">
                           <node concept="chp4Y" id="3NI0$JEbQLK" role="cj9EA">
@@ -465,9 +465,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3NI0$JEbQLA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1nN" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3NI0$JEbQLB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1nO" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -478,7 +478,7 @@
                   <node concept="3clFbF" id="3NI0$JEbQLF" role="3cqZAp">
                     <node concept="1PxgMI" id="3NI0$JEbQLG" role="3clFbG">
                       <node concept="37vLTw" id="6Jhc0CXtV0g" role="1m5AlR">
-                        <ref role="3cqZAo" node="3NI0$JEbQLI" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1nP" resolve="it" />
                       </node>
                       <node concept="chp4Y" id="OnnrMNmSPh" role="3oSUPX">
                         <ref role="cht4Q" to="bgic:3NI0$JEby2b" resolve="Property" />
@@ -486,9 +486,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3NI0$JEbQLI" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1nP" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3NI0$JEbQLJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1nQ" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/constraints.mps b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/constraints.mps
index 6e94b4dad75..02c6b5454ab 100644
--- a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/constraints.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/constraints.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/editor.mps
index aaa405fdc6a..350e9bd47a0 100644
--- a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/editor.mps
@@ -56,7 +56,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -86,7 +86,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps
index 9568bc6aafc..ababfcbb93f 100644
--- a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps
@@ -75,7 +75,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/typesystem.mps
index f0ee912b74e..33e6a09953f 100644
--- a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/typesystem.mps
@@ -51,7 +51,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -60,6 +60,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -141,7 +142,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -161,7 +162,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -306,7 +306,7 @@
                         <node concept="2OqwBi" id="7wlBVIeF7ce" role="3clFbG">
                           <node concept="2OqwBi" id="7wlBVIeF7cf" role="2Oq$k0">
                             <node concept="37vLTw" id="6Jhc0CXtV28" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7wlBVIeF7ck" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1nR" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7wlBVIeF7ch" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
@@ -320,9 +320,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7wlBVIeF7ck" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1nR" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7wlBVIeF7cl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1nS" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -344,7 +344,7 @@
                             <node concept="1PxgMI" id="7wlBVIeF7eO" role="2Oq$k0">
                               <node concept="2OqwBi" id="7wlBVIeF7eP" role="1m5AlR">
                                 <node concept="37vLTw" id="6Jhc0CXtV1p" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7wlBVIeF7eT" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1nT" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7wlBVIeF7eR" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
@@ -361,9 +361,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7wlBVIeF7eT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1nT" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7wlBVIeF7eU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1nU" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl b/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl
index 02c30f2f6d2..c2d14510c62 100644
--- a/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl
@@ -42,7 +42,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -104,7 +104,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="ce2335b7-fcfd-403e-8ace-08dd457fd818(mbeddr.tutorial.osconfig.cimpl)" version="0" />
         <module reference="c67ef9f8-e12a-4d38-afa6-6b505a82e782(mbeddr.tutorial.osconfig.cimpl#5485104033529951841)" version="0" />
       </dependencyVersions>
@@ -126,7 +125,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">a577a05d-67ad-41db-9547-6e5f0730b85d(mbeddr.tutorial.osconfig)</dependency>
   </dependencies>
@@ -134,7 +132,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -208,7 +206,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="a577a05d-67ad-41db-9547-6e5f0730b85d(mbeddr.tutorial.osconfig)" version="0" />
     <module reference="ce2335b7-fcfd-403e-8ace-08dd457fd818(mbeddr.tutorial.osconfig.cimpl)" version="0" />
   </dependencyVersions>
diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/generator/template/mbeddr/tutorial/osconfig/cimpl/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/cimpl/generator/template/mbeddr/tutorial/osconfig/cimpl/generator/template/main@generator.mps
index 9080d9f2f18..6eafabe1a65 100644
--- a/code/applications/tutorial-dsls-extensions/languages/cimpl/generator/template/mbeddr/tutorial/osconfig/cimpl/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/generator/template/mbeddr/tutorial/osconfig/cimpl/generator/template/main@generator.mps
@@ -98,7 +98,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -132,7 +132,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -142,7 +142,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/behavior.mps
index fc51a5d7020..b77ec3c5c7e 100644
--- a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/behavior.mps
@@ -43,13 +43,13 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/constraints.mps b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/constraints.mps
index bd11e7e70b8..3f60e0d01c9 100644
--- a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/constraints.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/constraints.mps
@@ -55,7 +55,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,6 +94,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -135,7 +136,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -143,7 +144,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -282,7 +282,7 @@
                       <node concept="3clFbF" id="OnnrMNmR$4" role="3cqZAp">
                         <node concept="2OqwBi" id="OnnrMNmR$5" role="3clFbG">
                           <node concept="37vLTw" id="OnnrMNmR$6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="OnnrMNmR$8" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1nY" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="OnnrMNmR$7" role="2OqNvi">
                             <ref role="3Tt5mk" to="7wyt:7HJwNEvkKas" resolve="resource" />
@@ -290,9 +290,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="OnnrMNmR$8" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1nY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="OnnrMNmR$9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1nZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/editor.mps
index 5c5a3922432..63d9020e66c 100644
--- a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/editor.mps
@@ -54,7 +54,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -80,7 +80,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/structure.mps
index d44dc3b21d4..7f70cb03515 100644
--- a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/structure.mps
@@ -34,7 +34,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/typesystem.mps
index ee73c41acb6..d3511f32e1e 100644
--- a/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/languageModels/typesystem.mps
@@ -75,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/demo.expr.mpl b/code/applications/tutorial-dsls-extensions/languages/demo.expr/demo.expr.mpl
index d9da6d0bc02..1da0e5d8ccc 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/demo.expr.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/demo.expr.mpl
@@ -43,7 +43,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -56,7 +55,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -74,7 +73,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/generator/template/main@generator.mps
index a671f475a3c..1337a7b57a6 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/generator/template/main@generator.mps
@@ -18,7 +18,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/behavior.mps
index 48eab15c09f..af7e3c84f68 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/behavior.mps
@@ -41,13 +41,13 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/constraints.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/constraints.mps
index 3aab2827506..1232c6b0542 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/constraints.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/constraints.mps
@@ -28,7 +28,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps
index 589bc4a8ff8..9483a70d55e 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps
@@ -62,7 +62,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -151,7 +151,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -173,7 +173,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -230,7 +230,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/plugin.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/plugin.mps
index 93f06f1b50e..d58f2ed1dc1 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/plugin.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:4b891481-a267-49b2-8bde-1630bae3d992(demo.expr.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/structure.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/structure.mps
index faef506098c..1282e7e5559 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/structure.mps
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/typesystem.mps
index ededcaef976..9586a82fbbd 100644
--- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/typesystem.mps
@@ -97,7 +97,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl b/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl
index 74af1bdc4e3..cf254dce501 100644
--- a/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl
@@ -43,7 +43,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -118,12 +118,11 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/foreach/generator/template/mbeddr/tutorial/foreach/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/foreach/generator/template/mbeddr/tutorial/foreach/generator/template/main@generator.mps
index e7ed168ed47..58aa5aa8393 100644
--- a/code/applications/tutorial-dsls-extensions/languages/foreach/generator/template/mbeddr/tutorial/foreach/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/foreach/generator/template/mbeddr/tutorial/foreach/generator/template/main@generator.mps
@@ -32,7 +32,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -118,7 +118,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -130,7 +130,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps
index 32b3b09fb0b..c07d1574bf4 100644
--- a/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps
@@ -113,7 +113,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/heap/generator/template/mbeddr/tutorial/heap/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/heap/generator/template/mbeddr/tutorial/heap/generator/template/main@generator.mps
index a8dda0286b3..c38b21b0be8 100644
--- a/code/applications/tutorial-dsls-extensions/languages/heap/generator/template/mbeddr/tutorial/heap/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/heap/generator/template/mbeddr/tutorial/heap/generator/template/main@generator.mps
@@ -54,7 +54,7 @@
       <concept id="745648737914844472" name="com.mbeddr.core.statements.structure.AnyNodeItem" flags="ng" index="2sYeqF">
         <child id="745648737914844473" name="theNode" index="2sYeqE" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -135,6 +135,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -152,7 +153,7 @@
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -196,13 +197,13 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
       <concept id="8463282783691618426" name="com.mbeddr.core.expressions.structure.Int8tType" flags="ng" index="26Vqqz" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -219,7 +220,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -319,7 +319,7 @@
                                     <node concept="3clFbC" id="5k1FOfehk0D" role="3clFbG">
                                       <node concept="2OqwBi" id="5k1FOfehk0d" role="3uHU7B">
                                         <node concept="37vLTw" id="5k1FOfehjZS" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5k1FOfehjZP" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1o9" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="zSFqGmbgqs" role="2OqNvi">
                                           <ref role="3Tt5mk" to="c4fa:3CmSUB7Fw7R" resolve="init" />
@@ -329,9 +329,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5k1FOfehjZP" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1o9" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="5k1FOfehjZQ" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1oa" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -462,7 +462,7 @@
                                     <node concept="3y3z36" id="1fAuj8Tv4ij" role="3clFbG">
                                       <node concept="2OqwBi" id="1fAuj8Tv4ik" role="3uHU7B">
                                         <node concept="37vLTw" id="1fAuj8Tv4il" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1fAuj8Tv4ie" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1ob" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="zSFqGmbgqz" role="2OqNvi">
                                           <ref role="3Tt5mk" to="c4fa:3CmSUB7Fw7R" resolve="init" />
@@ -472,9 +472,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1fAuj8Tv4ie" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1ob" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1fAuj8Tv4if" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1oc" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl b/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl
index d5c77b2cb68..e599614fd5f 100644
--- a/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl
@@ -43,7 +43,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -108,7 +108,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="16ff087a-23cd-49b8-9c5b-a2c20cea9d3e(mbeddr.tutorial.heap)" version="0" />
         <module reference="5f893116-247b-482a-bec7-c76b745a8d6f(mbeddr.tutorial.heap#6125369673958882338)" version="0" />
       </dependencyVersions>
@@ -130,7 +129,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
   </dependencies>
@@ -138,7 +136,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -216,7 +214,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="16ff087a-23cd-49b8-9c5b-a2c20cea9d3e(mbeddr.tutorial.heap)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/editor.mps
index b8e18fde391..3d228f7ee17 100644
--- a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/editor.mps
@@ -12,7 +12,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -24,7 +24,7 @@
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="6089045305654894366" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Default" flags="ng" index="2kknPJ" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="8478191136883534207" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_Selection" flags="ng" index="upBMk">
@@ -43,10 +43,10 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -70,7 +70,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -154,7 +154,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/intentions.mps b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/intentions.mps
index 6207d40c2f5..e4964c1bd2c 100644
--- a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/intentions.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/intentions.mps
@@ -44,6 +44,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -74,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -86,7 +87,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -178,15 +178,15 @@
                             </node>
                             <node concept="HtX7F" id="15Sel8ANPPt" role="2OqNvi">
                               <node concept="37vLTw" id="6Jhc0CXtV2N" role="HtX7I">
-                                <ref role="3cqZAo" node="15Sel8ANPNF" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1o2" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="15Sel8ANPNF" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1o2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="15Sel8ANPNG" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1o3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/scripts.mps b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/scripts.mps
index dce2914ed27..4d531b1f588 100644
--- a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/scripts.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/scripts.mps
@@ -56,6 +56,7 @@
       <concept id="1177458491964" name="jetbrains.mps.lang.script.structure.MigrationScriptPart_Instance_Updater" flags="in" index="_ZGcI" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -73,7 +74,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -85,7 +86,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -171,15 +171,15 @@
                               </node>
                               <node concept="HtX7F" id="15Sel8ANPPt" role="2OqNvi">
                                 <node concept="37vLTw" id="6Jhc0CXtV2Z" role="HtX7I">
-                                  <ref role="3cqZAo" node="15Sel8ANPNF" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1o4" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="15Sel8ANPNF" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1o4" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="15Sel8ANPNG" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1o5" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/typesystem.mps
index b89fb760031..fb9f6b0a9ce 100644
--- a/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/heap/languageModels/typesystem.mps
@@ -62,7 +62,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -72,6 +72,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -150,7 +151,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -162,7 +163,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -451,15 +451,15 @@
                             </node>
                             <node concept="HtX7F" id="15Sel8ANPPt" role="2OqNvi">
                               <node concept="37vLTw" id="6Jhc0CXtV3n" role="HtX7I">
-                                <ref role="3cqZAo" node="15Sel8ANPNF" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1o6" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="15Sel8ANPNF" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1o6" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="15Sel8ANPNG" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1o7" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/generator/template/main@generator.mps
index b5d85302832..4a4a8b4d2f1 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/behavior.mps
index 65a65e1cf53..2fcbd192eb4 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/behavior.mps
@@ -131,7 +131,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -147,7 +147,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -157,6 +157,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -171,7 +172,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -189,7 +190,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -447,7 +447,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="GKLijSN72F" role="1LFl5Q">
-                            <ref role="3cqZAo" node="GKLijSN6S9" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1od" resolve="it" />
                           </node>
                         </node>
                         <node concept="liA8E" id="GKLijSNdQQ" role="2OqNvi">
@@ -459,9 +459,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="GKLijSN6S9" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1od" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="GKLijSN6Sa" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1oe" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -555,7 +555,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="GKLijSNiEP" role="1LFl5Q">
-                            <ref role="3cqZAo" node="GKLijSNiES" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1of" resolve="it" />
                           </node>
                         </node>
                         <node concept="liA8E" id="GKLijSNiEQ" role="2OqNvi">
@@ -567,9 +567,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="GKLijSNiES" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1of" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="GKLijSNiET" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1og" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -605,7 +605,7 @@
                           <property role="3cmrfH" value="0" />
                         </node>
                         <node concept="37vLTw" id="GKLijSQ4d$" role="1LFl5Q">
-                          <ref role="3cqZAo" node="GKLijSQ45h" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1oh" resolve="it" />
                         </node>
                       </node>
                       <node concept="liA8E" id="GKLijSQ67W" role="2OqNvi">
@@ -620,9 +620,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="GKLijSQ45h" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1oh" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="GKLijSQ45i" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1oi" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps
index 2290cacc8b0..5cffb95ce91 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps
@@ -63,7 +63,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1176474535556" name="jetbrains.mps.lang.editor.structure.QueryFunction_JComponent" flags="in" index="3Fmcul" />
@@ -146,7 +146,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -163,7 +163,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -180,6 +180,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -192,7 +193,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -201,7 +202,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -238,14 +238,14 @@
                                   <property role="3cmrfH" value="0" />
                                 </node>
                                 <node concept="37vLTw" id="GKLijSPQzB" role="1LFl5Q">
-                                  <ref role="3cqZAo" node="GKLijSPPZ2" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1oj" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="GKLijSPPZ2" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1oj" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="GKLijSPPZ3" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1ok" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/structure.mps
index 4e602936875..83d8677689b 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/structure.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 05a4a7f82ed..cd2568e63bd 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
@@ -34,7 +34,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <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" />
@@ -82,7 +82,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
@@ -90,7 +89,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/generator/template/main@generator.mps
index 65d20a85194..a3138ca42a0 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/editor.mps
index 5df0fbdb4e3..990e56fd8c4 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/editor.mps
@@ -36,7 +36,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/intentions.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/intentions.mps
index 6a3e03abdfe..bac3dcf76dc 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/intentions.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/intentions.mps
@@ -52,7 +52,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps
index 981954c85c4..7fb7e27e9c8 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps
@@ -59,7 +59,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/typesystem.mps
index 6f5989ba0a1..045d501b565 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/typesystem.mps
@@ -62,7 +62,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -125,7 +125,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl
index 2b182476662..7998861acd8 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl
@@ -43,7 +43,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
     <dependency reexport="false">97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</dependency>
@@ -52,7 +51,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -130,7 +129,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="8cb5ab9f-a2c3-418b-a67c-c5690ef7361b(mbeddr.tutorial.layers)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/generator/template/main@generator.mps
index b8d9ad65036..6acae0efee9 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/generator/template/main@generator.mps
@@ -147,7 +147,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -175,7 +175,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -277,7 +277,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
@@ -321,7 +321,7 @@
       <concept id="1195502151594" name="jetbrains.mps.lang.generator.structure.MappingScriptReference" flags="lg" index="1puMqW">
         <reference id="1195502167610" name="mappingScript" index="1puQsG" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ngI" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
@@ -351,6 +351,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -419,10 +420,10 @@
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ng" index="k8FjF">
+      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ngI" index="k8FjF">
         <child id="883533952987441014" name="kind" index="3U$Ho4" />
       </concept>
-      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ng" index="2vgHxx">
+      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ngI" index="2vgHxx">
         <property id="2688792604368329410" name="overriddenCodeLocation" index="2vgHxy" />
       </concept>
       <concept id="6777508457268164807" name="com.mbeddr.core.modules.structure.SuppressDataFlowWarning" flags="ng" index="BCzjf" />
@@ -433,7 +434,7 @@
         <reference id="6021475212426147388" name="constant" index="BUAnL" />
         <child id="6021475212426185244" name="arguments" index="BULBh" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -441,7 +442,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -562,7 +563,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -589,7 +590,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
@@ -639,7 +640,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -1486,7 +1486,7 @@
                                 <node concept="2OqwBi" id="77vU5w32GuN" role="3clFbG">
                                   <node concept="2OqwBi" id="77vU5w32GuO" role="2Oq$k0">
                                     <node concept="37vLTw" id="77vU5w32GuP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="77vU5w32GuS" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1oy" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="2ue418prIVM" role="2OqNvi">
                                       <ref role="3TtcxE" to="5l2n:4LP87XufLjN" resolve="elements" />
@@ -1496,9 +1496,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="77vU5w32GuS" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1oy" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="77vU5w32GuT" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1oz" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -5372,7 +5372,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                   <node concept="2OqwBi" id="12M8iHJ6MOK" role="37wK5m">
                                     <node concept="37vLTw" id="12M8iHJ6MOL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="12M8iHJ6MON" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1o$" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="12M8iHJ6MOM" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5382,9 +5382,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="12M8iHJ6MON" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1o$" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="12M8iHJ6MOO" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1o_" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -5429,7 +5429,7 @@
                                         <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                         <node concept="2OqwBi" id="12M8iHJ6MP9" role="37wK5m">
                                           <node concept="37vLTw" id="12M8iHJ6MPa" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="12M8iHJ6MPc" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1oA" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="12M8iHJ6MPb" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5439,9 +5439,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="12M8iHJ6MPc" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1oA" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="12M8iHJ6MPd" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1oB" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -5468,7 +5468,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                   <node concept="2OqwBi" id="12M8iHJ6MPo" role="37wK5m">
                                     <node concept="37vLTw" id="12M8iHJ6MPp" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="12M8iHJ6MPr" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1oC" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="12M8iHJ6MPq" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5478,9 +5478,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="12M8iHJ6MPr" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1oC" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="12M8iHJ6MPs" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1oD" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -5597,7 +5597,7 @@
                                         <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                         <node concept="2OqwBi" id="12M8iHJ6SkS" role="37wK5m">
                                           <node concept="37vLTw" id="12M8iHJ6SkT" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="12M8iHJ6SkV" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1oE" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="12M8iHJ6SkU" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5607,9 +5607,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="12M8iHJ6SkV" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1oE" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="12M8iHJ6SkW" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1oF" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -5636,7 +5636,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                   <node concept="2OqwBi" id="12M8iHJ6Sl7" role="37wK5m">
                                     <node concept="37vLTw" id="12M8iHJ6Sl8" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="12M8iHJ6Sla" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1oG" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="12M8iHJ6Sl9" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5646,9 +5646,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="12M8iHJ6Sla" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1oG" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="12M8iHJ6Slb" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1oH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -5818,7 +5818,7 @@
                       <node concept="10Nm6u" id="12M8iHJ6MQi" role="3uHU7w" />
                       <node concept="2OqwBi" id="12M8iHJ6MQj" role="3uHU7B">
                         <node concept="37vLTw" id="12M8iHJ6MQk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="12M8iHJ6MQo" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1oI" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="12M8iHJ6MQl" role="2OqNvi">
                           <node concept="1xMEDy" id="12M8iHJ6MQm" role="1xVPHs">
@@ -5831,9 +5831,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="12M8iHJ6MQo" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1oI" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="12M8iHJ6MQp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1oJ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8013,7 +8013,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                   <node concept="2OqwBi" id="517Ozmf9Kta" role="37wK5m">
                                     <node concept="37vLTw" id="517Ozmf9Ktb" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="517Ozmf9Ktd" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1oK" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="517Ozmf9Ktc" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8023,9 +8023,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="517Ozmf9Ktd" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1oK" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="517Ozmf9Kte" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1oL" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -8069,7 +8069,7 @@
                                         <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                         <node concept="2OqwBi" id="517Ozmf9LcF" role="37wK5m">
                                           <node concept="37vLTw" id="517Ozmf9LcG" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="517Ozmf9LcI" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1oM" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="517Ozmf9LcH" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8079,9 +8079,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="517Ozmf9LcI" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1oM" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="517Ozmf9LcJ" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1oN" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -8108,7 +8108,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                   <node concept="2OqwBi" id="517Ozmf9LcU" role="37wK5m">
                                     <node concept="37vLTw" id="517Ozmf9LcV" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="517Ozmf9LcX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1oO" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="517Ozmf9LcW" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8118,9 +8118,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="517Ozmf9LcX" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1oO" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="517Ozmf9LcY" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1oP" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -8261,7 +8261,7 @@
                       <node concept="10Nm6u" id="35eY$082sFU" role="3uHU7w" />
                       <node concept="2OqwBi" id="35eY$082rom" role="3uHU7B">
                         <node concept="37vLTw" id="35eY$082rg1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="35eY$082qy5" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1oQ" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="35eY$082suM" role="2OqNvi">
                           <node concept="1xMEDy" id="35eY$082suO" role="1xVPHs">
@@ -8274,9 +8274,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="35eY$082qy5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1oQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="35eY$082qy6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1oR" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl
index c120c43ccf8..d2109863351 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl
@@ -51,7 +51,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -125,7 +125,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="d00351b1-72a6-4072-aea2-5982add6bee4(mbeddr.tutorial.shonan)" version="0" />
         <module reference="911d9207-f696-4583-847d-5378a7bc17a8(mbeddr.tutorial.shonan#4634425186961163609)" version="0" />
         <module reference="b68cce94-7c2b-436e-8b69-c33a9bcb11a0(mbeddr.tutorial.shonan.runtime)" version="0" />
@@ -260,7 +259,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</dependency>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
@@ -288,7 +286,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -373,7 +371,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="d00351b1-72a6-4072-aea2-5982add6bee4(mbeddr.tutorial.shonan)" version="0" />
     <module reference="b68cce94-7c2b-436e-8b69-c33a9bcb11a0(mbeddr.tutorial.shonan.runtime)" version="0" />
   </dependencyVersions>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/behavior.mps
index 7de0fff947d..84cceb0e5d8 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/behavior.mps
@@ -130,7 +130,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -147,7 +147,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -162,6 +162,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -234,7 +235,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -269,7 +270,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
@@ -537,7 +537,7 @@
                         <node concept="2OqwBi" id="9TuAn4hoQX" role="3uHU7B">
                           <node concept="2OqwBi" id="9TuAn4hoQY" role="2Oq$k0">
                             <node concept="37vLTw" id="9TuAn4hoQZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="9TuAn4hoR2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1on" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="72c7IDtdGzS" role="2OqNvi">
                               <ref role="3TtcxE" to="5l2n:4LP87XufLjN" resolve="elements" />
@@ -548,9 +548,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="9TuAn4hoR2" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1on" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="9TuAn4hoR3" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1oo" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -928,7 +928,7 @@
                         <node concept="3clFbF" id="7Yufpv5MDm1" role="3cqZAp">
                           <node concept="2OqwBi" id="7Yufpv5MDrJ" role="3clFbG">
                             <node concept="37vLTw" id="7Yufpv5MDm0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7Yufpv5MDf1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1op" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="7Yufpv5MDAI" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -936,9 +936,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7Yufpv5MDf1" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1op" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7Yufpv5MDf2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1oq" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/complex.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/complex.mps
index 8fde1724fbe..87df3f83caa 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/complex.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/complex.mps
@@ -12,7 +12,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -66,14 +66,14 @@
         <reference id="6021475212426147388" name="constant" index="BUAnL" />
         <child id="6021475212426185244" name="arguments" index="BULBh" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -93,7 +93,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -118,7 +118,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/constraints.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/constraints.mps
index 48bf141b2c6..659d2e30d7b 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/constraints.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/constraints.mps
@@ -82,7 +82,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -186,7 +186,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/dataFlow.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/dataFlow.mps
index c913a2de996..39d54b1acd7 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/dataFlow.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/dataFlow.mps
@@ -88,7 +88,7 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -150,7 +150,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/editor.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/editor.mps
index a88121ada9f..193eb1546a9 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/editor.mps
@@ -95,10 +95,10 @@
         <child id="1223387335081" name="query" index="3n$kyP" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -126,7 +126,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -160,12 +160,12 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -178,7 +178,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -270,7 +270,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -380,7 +380,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/intentions.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/intentions.mps
index 8801bdc88d0..dc3fea70456 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/intentions.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/intentions.mps
@@ -69,7 +69,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,6 +79,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -137,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -146,7 +147,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
     </language>
   </registry>
@@ -296,9 +296,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5TPCPz$cHmE" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1or" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5TPCPz$cHmF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1os" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/mbeddr.tutorial.shonan.enumMigration.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/mbeddr.tutorial.shonan.enumMigration.mps
index acb8b2a50a6..158576bd21c 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/mbeddr.tutorial.shonan.enumMigration.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/mbeddr.tutorial.shonan.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps
index f060d31557a..6cc5f55a591 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps
@@ -93,7 +93,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/typesystem.mps
index ef7b54d64d7..cc4a29f18a7 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/typesystem.mps
@@ -125,7 +125,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -148,7 +148,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -158,6 +158,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -329,7 +330,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -368,7 +369,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -2324,7 +2324,7 @@
                     <node concept="2OqwBi" id="5TPCPz$cNE$" role="3uHU7B">
                       <node concept="2OqwBi" id="5TPCPz$cNE8" role="2Oq$k0">
                         <node concept="37vLTw" id="6Jhc0CXtV1J" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5TPCPz$cNDK" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1ot" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="72c7IDthbcU" role="2OqNvi">
                           <ref role="3TtcxE" to="5l2n:4LP87XufLjN" resolve="elements" />
@@ -2335,9 +2335,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="5TPCPz$cNDK" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1ot" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="5TPCPz$cNDL" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1ou" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -2694,7 +2694,7 @@
                                   <node concept="2OqwBi" id="2diR0I37uLP" role="33vP2m">
                                     <node concept="2OqwBi" id="2diR0I37uLQ" role="2Oq$k0">
                                       <node concept="37vLTw" id="2diR0I37uLR" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2diR0I37uM7" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ov" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2diR0I37uLS" role="2OqNvi">
                                         <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -2739,9 +2739,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2diR0I37uM7" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1ov" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2diR0I37uM8" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1ow" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/generator/template/mbeddr/tutorial/smtrigger/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/generator/template/mbeddr/tutorial/smtrigger/generator/template/main@generator.mps
index 624efed5f99..8a0e178994c 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/generator/template/mbeddr/tutorial/smtrigger/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/generator/template/mbeddr/tutorial/smtrigger/generator/template/main@generator.mps
@@ -49,7 +49,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -68,7 +68,7 @@
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -96,6 +96,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -184,7 +185,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -195,7 +196,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -209,7 +210,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="bUwia" id="1LST_zkjhEn">
@@ -289,7 +289,7 @@
                         <node concept="2OqwBi" id="5r39rAsFlO9" role="3clFbG">
                           <node concept="2OqwBi" id="5r39rAsFlOa" role="2Oq$k0">
                             <node concept="37vLTw" id="5r39rAsFlOb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5r39rAsFlOh" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1oT" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="5r39rAsFlOc" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -307,9 +307,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5r39rAsFlOh" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1oT" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5r39rAsFlOi" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1oU" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/behavior.mps
index cc68277de37..a89b95a23c3 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/behavior.mps
@@ -46,7 +46,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -57,7 +57,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/intentions.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/intentions.mps
index cd000e2c7e2..436202f50fa 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/intentions.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/intentions.mps
@@ -49,7 +49,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/structure.mps
index e57c0ca459c..00bdf21a49d 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/languageModels/structure.mps
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl
index b5029507e97..3afde441878 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl
@@ -59,7 +59,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -123,7 +123,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="8f78d0b6-57c9-4fa8-86fe-8c30d0d5b15c(mbeddr.tutorial.smtrigger)" version="0" />
         <module reference="afa48319-8ac2-446a-b8b2-5e2332176ee4(mbeddr.tutorial.smtrigger#2051642899460594294)" version="0" />
       </dependencyVersions>
@@ -145,7 +144,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines)</dependency>
   </dependencies>
@@ -153,7 +151,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -232,7 +230,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="8f78d0b6-57c9-4fa8-86fe-8c30d0d5b15c(mbeddr.tutorial.smtrigger)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/behavior.mps
index 0963baab532..39c2ad2efa2 100644
--- a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/behavior.mps
@@ -42,7 +42,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/constraints.mps b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/constraints.mps
index ebade8c0758..2a5f391aaa5 100644
--- a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/constraints.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/constraints.mps
@@ -26,7 +26,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/editor.mps
index 286ad9f11d5..2acd32e30bb 100644
--- a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/editor.mps
@@ -45,7 +45,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/structure.mps
index bd94f26975b..de822875332 100644
--- a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/structure.mps
@@ -34,7 +34,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/typesystem.mps
index a797a967be5..0a7aa760981 100644
--- a/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/memory/languageModels/typesystem.mps
@@ -61,7 +61,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl b/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl
index 70730047b74..17dacd80d0d 100644
--- a/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/metadata/generator/template/main@generator.mps
index e47181ad73d..f34bf386a93 100644
--- a/code/applications/tutorial-dsls-extensions/languages/metadata/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/metadata/generator/template/main@generator.mps
@@ -11,7 +11,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/editor.mps
index 64509fdf107..b8509fad8ee 100644
--- a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/editor.mps
@@ -44,7 +44,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/intentions.mps b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/intentions.mps
index 1c6b0dfdc92..c73360c1168 100644
--- a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/intentions.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/intentions.mps
@@ -59,7 +59,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps
index 174064f3ada..9327966e16b 100644
--- a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps
@@ -77,7 +77,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/typesystem.mps
index cb34e84594d..902684523c9 100644
--- a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/typesystem.mps
@@ -57,6 +57,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -132,7 +133,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -148,7 +149,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -321,7 +321,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="2zx$mQQxGb7" role="3uHU7B">
                                         <node concept="37vLTw" id="6Jhc0CXtV3A" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2zx$mQQxGba" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1oW" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="2zx$mQQxGb9" role="2OqNvi">
                                           <ref role="3Tt5mk" to="od47:2zx$mQQxDpa" resolve="role" />
@@ -330,9 +330,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2zx$mQQxGba" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1oW" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="2zx$mQQxGbb" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1oX" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl b/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl
index 089f4e95069..b528441b537 100644
--- a/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl
@@ -69,7 +69,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)</dependency>
   </dependencies>
@@ -77,7 +76,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -155,7 +154,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="7fc59e55-0f30-4694-b8e3-d334e472c924(mbeddr.tutorial.metadata)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/editor.mps
index ba7b074c069..924068c36de 100644
--- a/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/editor.mps
@@ -42,7 +42,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -65,7 +65,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/structure.mps
index 067dd1a7cf5..c4c5508b49c 100644
--- a/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/structure.mps
@@ -40,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/textGen.mps b/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/textGen.mps
index 66b078844cd..25a29d1bc77 100644
--- a/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/textGen.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/osconfig/languageModels/textGen.mps
@@ -64,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl b/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl
index f89eb7f2f06..b4bb2040044 100644
--- a/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/generator/template/main@generator.mps b/code/applications/tutorial-dsls-extensions/languages/spellcheck/generator/template/main@generator.mps
index 6a94cfa2e4b..8f9faee4cc8 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/generator/template/main@generator.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/behavior.mps b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/behavior.mps
index 56a376bc563..3a9930f7c2c 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/behavior.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/behavior.mps
@@ -46,7 +46,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -57,7 +57,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/editor.mps
index 0ecdddeb774..1c97625fd81 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/editor.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/editor.mps
@@ -54,7 +54,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -76,7 +76,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -84,7 +84,7 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/intentions.mps b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/intentions.mps
index 2d5ca2ecbd3..9d8c5ba85bd 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/intentions.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/intentions.mps
@@ -116,7 +116,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -137,7 +137,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -155,6 +155,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -225,7 +226,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -258,7 +259,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -311,7 +311,7 @@
                       <node concept="3cpWs3" id="2eNFjNPF0si" role="37vLTx">
                         <node concept="2OqwBi" id="2eNFjNPF0I3" role="3uHU7w">
                           <node concept="37vLTw" id="2eNFjNPF0zO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2eNFjNPEPu$" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1p0" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2eNFjNPF14I" role="2OqNvi">
                             <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -327,9 +327,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2eNFjNPEPu$" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1p0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2eNFjNPEPu_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1p1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -506,7 +506,7 @@
                                               <node concept="3cpWs3" id="2eNFjNPIv2x" role="37wK5m">
                                                 <node concept="2OqwBi" id="2eNFjNPIviw" role="3uHU7w">
                                                   <node concept="37vLTw" id="2eNFjNPIv2E" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                                                   </node>
                                                   <node concept="2qgKlT" id="2eNFjNPIvFE" role="2OqNvi">
                                                     <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -546,7 +546,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="2eNFjNPHO8Y" role="37vLTJ">
                                                 <node concept="37vLTw" id="2eNFjNPHO6j" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                                                 </node>
                                                 <node concept="3CFZ6_" id="2eNFjNPHOvy" role="2OqNvi">
                                                   <node concept="3CFYIy" id="2eNFjNPHOAE" role="3CFYIz">
@@ -561,7 +561,7 @@
                                           <node concept="10Nm6u" id="55YMheoaSPn" role="3uHU7w" />
                                           <node concept="2OqwBi" id="55YMheoaRqa" role="3uHU7B">
                                             <node concept="37vLTw" id="55YMheoaR63" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                                             </node>
                                             <node concept="3CFZ6_" id="55YMheoaRPY" role="2OqNvi">
                                               <node concept="3CFYIy" id="55YMheoaSau" role="3CFYIz">
@@ -587,7 +587,7 @@
                                         <node concept="2OqwBi" id="55YMheobkyL" role="2GsD0m">
                                           <node concept="2OqwBi" id="55YMheobj2_" role="2Oq$k0">
                                             <node concept="37vLTw" id="55YMheobiGb" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                                             </node>
                                             <node concept="3CFZ6_" id="55YMheobjAx" role="2OqNvi">
                                               <node concept="3CFYIy" id="55YMheobk3v" role="3CFYIz">
@@ -650,7 +650,7 @@
                                           <node concept="2OqwBi" id="2eNFjNPHQ6L" role="2Oq$k0">
                                             <node concept="2OqwBi" id="2eNFjNPHPCi" role="2Oq$k0">
                                               <node concept="37vLTw" id="2eNFjNPHP_y" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                                               </node>
                                               <node concept="3CFZ6_" id="2eNFjNPHPQt" role="2OqNvi">
                                                 <node concept="3CFYIy" id="2eNFjNPHPY5" role="3CFYIz">
@@ -673,7 +673,7 @@
                                     <node concept="2OqwBi" id="2eNFjNPHN05" role="3clFbw">
                                       <node concept="2OqwBi" id="2eNFjNPHMrv" role="2Oq$k0">
                                         <node concept="37vLTw" id="2eNFjNPHMnq" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="2eNFjNPHMKz" role="2OqNvi">
                                           <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -707,7 +707,7 @@
                           <node concept="10Nm6u" id="2eNFjNPJxGo" role="3uHU7w" />
                           <node concept="2OqwBi" id="2eNFjNPJwxz" role="3uHU7B">
                             <node concept="37vLTw" id="2eNFjNPJwi6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2eNFjNPJx4d" role="2OqNvi">
                               <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -719,15 +719,15 @@
                     <node concept="3y3z36" id="2eNFjNPJs8l" role="3clFbw">
                       <node concept="10Nm6u" id="2eNFjNPJsww" role="3uHU7w" />
                       <node concept="37vLTw" id="2eNFjNPJrQU" role="3uHU7B">
-                        <ref role="3cqZAo" node="2eNFjNPHLJU" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1p2" resolve="it" />
                       </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="2eNFjNPJqeQ" role="3cqZAp" />
                 </node>
-                <node concept="Rh6nW" id="2eNFjNPHLJU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1p2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2eNFjNPHLJV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1p3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2085,15 +2085,15 @@
                   <node concept="3clFbF" id="gOs49dpoUb" role="3cqZAp">
                     <node concept="2OqwBi" id="gOs49dpoXO" role="3clFbG">
                       <node concept="37vLTw" id="gOs49dpoUa" role="2Oq$k0">
-                        <ref role="3cqZAo" node="gOs49dpoQA" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1p4" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="gOs49dpqzE" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="gOs49dpoQA" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1p4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="gOs49dpoQB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1p5" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/structure.mps
index b00328e851c..626fdfe9123 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/structure.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/structure.mps
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/typesystem.mps
index 98c44e1e751..1cda2795f2b 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/typesystem.mps
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/languageModels/typesystem.mps
@@ -30,7 +30,7 @@
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -74,7 +74,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/runtime/spellcheck.runtime.msd b/code/applications/tutorial-dsls-extensions/languages/spellcheck/runtime/spellcheck.runtime.msd
index f4e279d266d..b2e3f8be59d 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/runtime/spellcheck.runtime.msd
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/runtime/spellcheck.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="spellcheck.runtime" uuid="2924ac23-1628-443a-a799-ad25f0611b97" moduleVersion="0" compileInMPS="true">
+<solution name="spellcheck.runtime" uuid="2924ac23-1628-443a-a799-ad25f0611b97" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions />
   <dependencyVersions>
     <module reference="2924ac23-1628-443a-a799-ad25f0611b97(spellcheck.runtime)" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl b/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl
index 2f5fdddb96c..5d1dfd5e65c 100644
--- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl
@@ -47,7 +47,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
@@ -56,7 +55,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd
index 0ff1252a27b..48abec4fa3d 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd
+++ b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="demo.expr.interpreter" uuid="48fdbef2-9bd5-4067-a355-93c33f43a193" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="demo.expr.interpreter" uuid="48fdbef2-9bd5-4067-a355-93c33f43a193" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">444fc60e-b7e2-46c2-95fa-301dd48918b2(demo.expr)</dependency>
   </dependencies>
@@ -18,7 +17,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/models/plugin.mps b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/models/plugin.mps
index e72f14e3f19..391d160853c 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/models/plugin.mps
+++ b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/models/plugin.mps
@@ -24,7 +24,7 @@
       </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,7 +78,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/demo.expr.sandbox.msd b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/demo.expr.sandbox.msd
index cb37156bcf9..09a378ec279 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/demo.expr.sandbox.msd
+++ b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/demo.expr.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="demo.expr.sandbox" uuid="c08dd3fc-048f-4ab2-83c8-5a6b63c5df2e" moduleVersion="0" compileInMPS="true">
+<solution name="demo.expr.sandbox" uuid="c08dd3fc-048f-4ab2-83c8-5a6b63c5df2e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:444fc60e-b7e2-46c2-95fa-301dd48918b2:demo.expr" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/models/demo/expr/sandbox/main.mps b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/models/demo/expr/sandbox/main.mps
index db454149857..cce8fd667d0 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/models/demo/expr/sandbox/main.mps
+++ b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.sandbox/models/demo/expr/sandbox/main.mps
@@ -32,7 +32,7 @@
       <concept id="4065005624680070798" name="demo.expr.structure.IntType" flags="ng" index="Prfeq" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 f5d205442dc..6b1c65a6996 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.exceptionhandling.library" uuid="d76eac52-ac9a-4fa0-9366-63ecb42b92ea" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.ext.exceptionhandling.library" uuid="d76eac52-ac9a-4fa0-9366-63ecb42b92ea" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -40,7 +39,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/models/com/mbeddr/ext/exceptionhandling/library/rt.mps b/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/models/com/mbeddr/ext/exceptionhandling/library/rt.mps
index 4869b68ea0f..cbf8700da77 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/models/com/mbeddr/ext/exceptionhandling/library/rt.mps
+++ b/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/models/com/mbeddr/ext/exceptionhandling/library/rt.mps
@@ -12,7 +12,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -63,7 +63,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -94,7 +94,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -123,10 +123,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -134,7 +134,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -160,7 +160,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -184,7 +184,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd
index ebedafaec96..55b087e8d8e 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd
+++ b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.tutorial.dsls.extensions.main" uuid="a7292b45-a622-4bdd-8ad7-355a75a551a5" moduleVersion="0" compileInMPS="true">
+<solution name="mbeddr.tutorial.dsls.extensions.main" uuid="a7292b45-a622-4bdd-8ad7-355a75a551a5" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:53bab999-e9c3-428a-80be-fef5bed08f55:com.mbeddr.cc.trace" version="0" />
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps
index b5811302155..7542c72e7ba 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps
+++ b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps
@@ -24,7 +24,7 @@
   </imports>
   <registry>
     <language id="53bab999-e9c3-428a-80be-fef5bed08f55" name="com.mbeddr.cc.trace">
-      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ng" index="FamN3">
+      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ngI" index="FamN3">
         <child id="4577779292081946445" name="refs" index="Fanle" />
         <child id="4577779292081946444" name="tracekind" index="Fanlf" />
       </concept>
@@ -88,7 +88,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -151,7 +151,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -223,7 +223,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="865293814733114043" name="com.mbeddr.core.base.structure.AssessmentContainer" flags="ng" index="3pwaUo">
@@ -242,7 +242,7 @@
         <reference id="747084250476878887" name="chunk" index="3GEb4d" />
       </concept>
       <concept id="806361095877923648" name="com.mbeddr.core.base.structure.CheckHashAssessmentQuery" flags="ng" index="3NjPp$" />
-      <concept id="806361095879159361" name="com.mbeddr.core.base.structure.IExtRef" flags="ng" index="3NCEH_">
+      <concept id="806361095879159361" name="com.mbeddr.core.base.structure.IExtRef" flags="ngI" index="3NCEH_">
         <property id="806361095889337969" name="lastUpdated" index="3M7nHl" />
         <property id="806361095879170784" name="hash" index="3NC_Z4" />
         <property id="806361095879170783" name="extID" index="3NC_ZV" />
@@ -296,7 +296,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -304,7 +304,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -317,7 +317,7 @@
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -434,7 +434,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -468,7 +468,7 @@
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
@@ -476,7 +476,7 @@
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
       <concept id="22102029902365709" name="com.mbeddr.core.expressions.structure.AssignmentExpr" flags="ng" index="3pqW6w" />
-      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ng" index="1Ml8iu">
+      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ngI" index="1Ml8iu">
         <child id="7336544617004013388" name="valueType" index="UxbcT" />
       </concept>
       <concept id="6610873504380029780" name="com.mbeddr.core.expressions.structure.CastExpression" flags="ng" index="1S8S4T">
diff --git a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd
index 9c574f175ee..374fda157c4 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd
+++ b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.tutorial.shonan.runtime" uuid="b68cce94-7c2b-436e-8b69-c33a9bcb11a0" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="mbeddr.tutorial.shonan.runtime" uuid="b68cce94-7c2b-436e-8b69-c33a9bcb11a0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
@@ -25,7 +24,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -86,7 +85,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="d00351b1-72a6-4072-aea2-5982add6bee4(mbeddr.tutorial.shonan)" version="0" />
     <module reference="b68cce94-7c2b-436e-8b69-c33a9bcb11a0(mbeddr.tutorial.shonan.runtime)" version="0" />
   </dependencyVersions>
diff --git a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/models/mbeddr/tutorial/shonan/runtime/plugin.mps b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/models/mbeddr/tutorial/shonan/runtime/plugin.mps
index 72645f9b4e8..3551fad17ef 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/models/mbeddr/tutorial/shonan/runtime/plugin.mps
+++ b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/models/mbeddr/tutorial/shonan/runtime/plugin.mps
@@ -80,7 +80,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -223,7 +223,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -252,7 +252,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -284,6 +284,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -431,7 +432,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -478,7 +479,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
@@ -983,7 +983,7 @@
                         <node concept="10Nm6u" id="365vTS8vHKl" role="3uHU7w" />
                         <node concept="2OqwBi" id="365vTS8vHKm" role="3uHU7B">
                           <node concept="37vLTw" id="365vTS8vHKn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="365vTS8vHKq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2uE" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="365vTS8vHKo" role="2OqNvi">
                             <node concept="3CFYIy" id="365vTS8vHKp" role="3CFYIz">
@@ -994,9 +994,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="365vTS8vHKq" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2uE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="365vTS8vHKr" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2uF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1796,7 +1796,7 @@
                                   <ref role="3uigEE" node="9TuAn4AbaT" resolve="SNodeDisguise" />
                                 </node>
                                 <node concept="37vLTw" id="9TuAn4GqvC" role="10QFUP">
-                                  <ref role="3cqZAo" node="9TuAn4AwPQ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2uG" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -1810,9 +1810,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="9TuAn4AwPQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2uG" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="9TuAn4AwPR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2uH" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3691,7 +3691,7 @@
                         <node concept="2OqwBi" id="12852iL9oVf" role="3uHU7B">
                           <node concept="2OqwBi" id="12852iL9oVg" role="2Oq$k0">
                             <node concept="37vLTw" id="12852iL9oVh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="12852iL9oVk" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2uI" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="12852iL9oVi" role="2OqNvi">
                               <ref role="3Tt5mk" to="5l2n:12852iL1LFU" resolve="reference" />
@@ -3704,9 +3704,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="12852iL9oVk" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2uI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="12852iL9oVl" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2uJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5689,7 +5689,7 @@
                           <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="70MaWCOV$VC" role="37wK5m">
                             <node concept="37vLTw" id="70MaWCOV$vB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="70MaWCOVza_" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2uK" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="70MaWCOV_o9" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5699,9 +5699,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="70MaWCOVza_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2uK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="70MaWCOVzaA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2uL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd
index 73d7f33f35b..598ae30686e 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.tutorial.shonan.test" uuid="58c759dc-80bf-4dde-8379-d8783424ef21" moduleVersion="0" compileInMPS="true">
+<solution name="mbeddr.tutorial.shonan.test" uuid="58c759dc-80bf-4dde-8379-d8783424ef21" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -36,7 +35,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_aos@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_aos@tests.mps
index a6cc8dace03..a840840d56f 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_aos@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_aos@tests.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:6c5f7921-2e6d-4f07-8717-7f38a14b273a(mbeddr.tutorial.shonan.test.complex_aos@tests)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="5" />
@@ -18,7 +19,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -79,7 +80,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -106,7 +107,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -115,7 +116,7 @@
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
       <concept id="6777508457268164807" name="com.mbeddr.core.modules.structure.SuppressDataFlowWarning" flags="ng" index="BCzjf" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -123,7 +124,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -159,7 +160,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -177,7 +178,7 @@
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_soa@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_soa@tests.mps
index 6de239df833..7047b95a1fb 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_soa@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/complex_soa@tests.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:c95cd812-f4dd-4ba2-8ea6-5e5ce2b5e751(mbeddr.tutorial.shonan.test.complex_soa@tests)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="5" />
@@ -19,7 +20,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -82,7 +83,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -109,7 +110,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -118,7 +119,7 @@
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
       <concept id="6777508457268164807" name="com.mbeddr.core.modules.structure.SuppressDataFlowWarning" flags="ng" index="BCzjf" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -126,7 +127,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -162,7 +163,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -180,7 +181,7 @@
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/diffusion@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/diffusion@tests.mps
index 7588f5ca34f..9845444e681 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/diffusion@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/diffusion@tests.mps
@@ -23,7 +23,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="d00351b1-72a6-4072-aea2-5982add6bee4" name="mbeddr.tutorial.shonan">
-      <concept id="8284846660091650166" name="mbeddr.tutorial.shonan.structure.IStencilComputationElement" flags="ng" index="3Cp1i">
+      <concept id="8284846660091650166" name="mbeddr.tutorial.shonan.structure.IStencilComputationElement" flags="ngI" index="3Cp1i">
         <child id="8284846660091650167" name="initializer" index="3Cp1j" />
       </concept>
       <concept id="5614144563374998802" name="mbeddr.tutorial.shonan.structure.StencilLocalVarRef" flags="ng" index="cgjuI" />
@@ -115,7 +115,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -152,7 +152,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -174,7 +174,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -182,7 +182,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -212,7 +212,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -232,7 +232,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/image@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/image@tests.mps
index aaaa509745f..b37d0dac9b7 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/image@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/image@tests.mps
@@ -25,7 +25,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -53,7 +53,7 @@
       </concept>
     </language>
     <language id="d00351b1-72a6-4072-aea2-5982add6bee4" name="mbeddr.tutorial.shonan">
-      <concept id="8284846660091650166" name="mbeddr.tutorial.shonan.structure.IStencilComputationElement" flags="ng" index="3Cp1i">
+      <concept id="8284846660091650166" name="mbeddr.tutorial.shonan.structure.IStencilComputationElement" flags="ngI" index="3Cp1i">
         <child id="8284846660091650167" name="initializer" index="3Cp1j" />
       </concept>
       <concept id="5614144563374998802" name="mbeddr.tutorial.shonan.structure.StencilLocalVarRef" flags="ng" index="cgjuI" />
@@ -103,7 +103,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -134,7 +134,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -153,7 +153,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -161,7 +161,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -191,7 +191,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -219,7 +219,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/matrix@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/matrix@tests.mps
index ebbaccfa791..3485f166e82 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/matrix@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/matrix@tests.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:0fb255cb-92f5-487b-b300-d75d80d903d5(mbeddr.tutorial.shonan.test.matrix@tests)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="2" />
@@ -15,7 +16,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf">
@@ -70,7 +71,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -90,7 +91,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -99,14 +100,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -119,7 +120,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -132,7 +133,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_blocking@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_blocking@tests.mps
index f6d04f0a8e6..74917e3a263 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_blocking@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_blocking@tests.mps
@@ -48,7 +48,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -59,7 +59,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -72,7 +72,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
     </language>
@@ -90,7 +90,7 @@
       <concept id="666324024671982185" name="com.mbeddr.ext.math.structure.MathConfigurationItem" flags="ng" index="22RD12" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_caching@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_caching@tests.mps
index 21632b1fc20..9d31e2ac480 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_caching@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_caching@tests.mps
@@ -46,7 +46,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -57,7 +57,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -70,7 +70,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
       <concept id="666324024671982185" name="com.mbeddr.ext.math.structure.MathConfigurationItem" flags="ng" index="22RD12" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_default@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_default@tests.mps
index 78425cbf9a9..25dac062eaa 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_default@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_default@tests.mps
@@ -46,7 +46,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -57,7 +57,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -70,7 +70,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
       <concept id="666324024671982185" name="com.mbeddr.ext.math.structure.MathConfigurationItem" flags="ng" index="22RD12" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_util@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_util@tests.mps
index 30674404b59..14a5838b967 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_util@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/models/mbeddr/tutorial/shonan/test/stencil_util@tests.mps
@@ -22,7 +22,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -53,7 +53,7 @@
       </concept>
     </language>
     <language id="d00351b1-72a6-4072-aea2-5982add6bee4" name="mbeddr.tutorial.shonan">
-      <concept id="8284846660091650166" name="mbeddr.tutorial.shonan.structure.IStencilComputationElement" flags="ng" index="3Cp1i">
+      <concept id="8284846660091650166" name="mbeddr.tutorial.shonan.structure.IStencilComputationElement" flags="ngI" index="3Cp1i">
         <child id="8284846660091650167" name="initializer" index="3Cp1j" />
       </concept>
       <concept id="5614144563374998802" name="mbeddr.tutorial.shonan.structure.StencilLocalVarRef" flags="ng" index="cgjuI" />
@@ -94,7 +94,7 @@
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
       <concept id="6777508457268164807" name="com.mbeddr.core.modules.structure.SuppressDataFlowWarning" flags="ng" index="BCzjf" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -102,7 +102,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -144,7 +144,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -160,7 +160,7 @@
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/models/mbeddr/tutorial/typesystemtests/matrix@tests.mps b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/models/mbeddr/tutorial/typesystemtests/matrix@tests.mps
index 3c9f4de7da5..64cf4ab364c 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/models/mbeddr/tutorial/typesystemtests/matrix@tests.mps
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/models/mbeddr/tutorial/typesystemtests/matrix@tests.mps
@@ -26,7 +26,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf">
@@ -68,7 +68,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -86,7 +86,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -96,7 +96,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd
index 9fc7ddb03bc..9ef342bcb3a 100644
--- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd
+++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.tutorial.typesystemtests" uuid="8d0b45ab-f5f6-42ef-9f1c-c9dab8872e09" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="mbeddr.tutorial.typesystemtests" uuid="8d0b45ab-f5f6-42ef-9f1c-c9dab8872e09" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -41,7 +40,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial/.mps/migration.xml b/code/applications/tutorial/.mps/migration.xml
index 397f7dc90c3..65112394c89 100644
--- a/code/applications/tutorial/.mps/migration.xml
+++ b/code/applications/tutorial/.mps/migration.xml
@@ -18,6 +18,10 @@
     <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="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -26,6 +30,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="222" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd b/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd
index f3b0fab9106..4f3e67e1185 100644
--- a/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tutorial.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#tutorial.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="tutorial.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#tutorial.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial/_spreferences/PlatformTemplates/models/tutorial/__spreferences/PlatformTemplates.mps b/code/applications/tutorial/_spreferences/PlatformTemplates/models/tutorial/__spreferences/PlatformTemplates.mps
index 879dce600bc..f07677d0d6b 100644
--- a/code/applications/tutorial/_spreferences/PlatformTemplates/models/tutorial/__spreferences/PlatformTemplates.mps
+++ b/code/applications/tutorial/_spreferences/PlatformTemplates/models/tutorial/__spreferences/PlatformTemplates.mps
@@ -23,12 +23,12 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd b/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd
index dd7fc4b7f45..90a4a164d1e 100644
--- a/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd
+++ b/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tutorial.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#tutorial.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="tutorial.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#tutorial.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd
index a31a442a7e9..a08a8cea10b 100644
--- a/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tutorial.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#tutorial.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="tutorial.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#tutorial.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd b/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd
index 0397663ec04..49dc30b71dc 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd
+++ b/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.editingGuide" uuid="44ce4404-473f-43bf-a54c-40d7c6f01639" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.editingGuide" uuid="44ce4404-473f-43bf-a54c-40d7c6f01639" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c6e0a639-6829-4d71-a41c-9d693d7cdea5(com.mbeddr.mpsutil.editingGuide.runtime)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -51,7 +50,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -108,7 +107,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/applications/tutorial/solutions/com.mbeddr.editingGuide/models/com/mbeddr/editingGuide/basics.mps b/code/applications/tutorial/solutions/com.mbeddr.editingGuide/models/com/mbeddr/editingGuide/basics.mps
index 1d0c1e9052e..8e89c31b778 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.editingGuide/models/com/mbeddr/editingGuide/basics.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.editingGuide/models/com/mbeddr/editingGuide/basics.mps
@@ -74,7 +74,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -96,7 +96,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -132,6 +132,7 @@
       <concept id="5679441017214012545" name="com.mbeddr.core.pointers.structure.ArrayType" flags="ng" index="3J0A42" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -144,7 +145,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -191,14 +192,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -206,7 +207,7 @@
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="6610873504380335822" name="com.mbeddr.core.modules.structure.GlobalVariableDeclaration" flags="ng" index="1S7NMz">
@@ -275,7 +276,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -299,7 +300,7 @@
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -322,7 +323,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -2702,7 +2702,7 @@
                         <node concept="2OqwBi" id="4x22hTwiTbS" role="3clFbG">
                           <node concept="2OqwBi" id="4x22hTwiTbT" role="2Oq$k0">
                             <node concept="37vLTw" id="4x22hTwiTbU" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4x22hTwiTbY" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2uM" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="4x22hTwiTbV" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2717,9 +2717,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4x22hTwiTbY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2uM" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4x22hTwiTbZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2uN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3125,7 +3125,7 @@
                         <node concept="2OqwBi" id="2QDtwSqCUq9" role="3clFbG">
                           <node concept="2OqwBi" id="2QDtwSqCUqa" role="2Oq$k0">
                             <node concept="37vLTw" id="2QDtwSqCUqb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2QDtwSqCUqf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2uO" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2QDtwSqCUqc" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3140,9 +3140,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2QDtwSqCUqf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2uO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2QDtwSqCUqg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2uP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3228,7 +3228,7 @@
                           <node concept="2OqwBi" id="2QDtwSqCUqP" role="3clFbG">
                             <node concept="2OqwBi" id="2QDtwSqCUqQ" role="2Oq$k0">
                               <node concept="37vLTw" id="2QDtwSqCUqR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2QDtwSqCUqV" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2uQ" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2QDtwSqCUqS" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3243,9 +3243,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2QDtwSqCUqV" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2uQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2QDtwSqCUqW" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2uR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3285,7 +3285,7 @@
                           <node concept="2OqwBi" id="2QDtwSqCUre" role="3clFbG">
                             <node concept="2OqwBi" id="2QDtwSqCUrf" role="2Oq$k0">
                               <node concept="37vLTw" id="2QDtwSqCUrg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2QDtwSqCUrk" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2uS" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2QDtwSqCUrh" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3300,9 +3300,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2QDtwSqCUrk" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2uS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2QDtwSqCUrl" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2uT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3391,7 +3391,7 @@
                             <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                             <node concept="2OqwBi" id="2QDtwSqCUrU" role="37wK5m">
                               <node concept="37vLTw" id="2QDtwSqCUrV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2QDtwSqCUrX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2uU" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2QDtwSqCUrW" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3401,9 +3401,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2QDtwSqCUrX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2uU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2QDtwSqCUrY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2uV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3457,7 +3457,7 @@
                             <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                             <node concept="2OqwBi" id="2QDtwSqCUsn" role="37wK5m">
                               <node concept="37vLTw" id="2QDtwSqCUso" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2QDtwSqCUsq" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2uW" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2QDtwSqCUsp" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3467,9 +3467,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2QDtwSqCUsq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2uW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2QDtwSqCUsr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2uX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4373,7 +4373,7 @@
                       <node concept="3clFbF" id="2QDtwSqD1c2" role="3cqZAp">
                         <node concept="2OqwBi" id="2QDtwSqD1c3" role="3clFbG">
                           <node concept="37vLTw" id="2QDtwSqD1c4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2QDtwSqD1c7" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2uY" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="2QDtwSqD1c5" role="2OqNvi">
                             <node concept="chp4Y" id="2QDtwSqD1c6" role="cj9EA">
@@ -4383,9 +4383,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2QDtwSqD1c7" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2uY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2QDtwSqD1c8" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2uZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4491,7 +4491,7 @@
                       <node concept="3clFbF" id="2QDtwSqD1cM" role="3cqZAp">
                         <node concept="2OqwBi" id="2QDtwSqD1cN" role="3clFbG">
                           <node concept="37vLTw" id="2QDtwSqD1cO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2QDtwSqD1cR" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2v0" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="2QDtwSqD1cP" role="2OqNvi">
                             <node concept="chp4Y" id="2QDtwSqD1cQ" role="cj9EA">
@@ -4501,9 +4501,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2QDtwSqD1cR" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2v0" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2QDtwSqD1cS" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2v1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/build.xml b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/build.xml
index c3d5d891047..e530675abb0 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/build.xml
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/build.xml
@@ -39,7 +39,7 @@
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
     <fileset dir="${artifacts.mps}/lib">
-      <include name="util.jar" />
+      <include name="util-8.jar" />
     </fileset>
   </path>
   
@@ -67,6 +67,7 @@
     <echo message="generating" />
     <generate fork="true" logLevel="${mps.ant.log}">      
       <settings refid="m2m-defaults" />
+      <plugin path="${artifacts.com.mbeddr.platform}/MPS.Kotlin" />
       <plugin path="${artifacts.com.mbeddr.platform}/MPS.ThirdParty" />
       <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.common" />
       <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.compare" />
@@ -101,6 +102,7 @@
       <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.grammarcells" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.utils" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.stubs.batik" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.q60.mps.collections.libs" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.slisson.mps.conditionalEditor" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks" />
@@ -124,7 +126,9 @@
       <plugin path="${artifacts.mps}/plugins/mps-execution-languages" />
       <plugin path="${artifacts.mps}/plugins/mps-git4idea" />
       <plugin path="${artifacts.mps}/plugins/mps-httpsupport" />
+      <plugin path="${artifacts.mps}/plugins/mps-ide" />
       <plugin path="${artifacts.mps}/plugins/mps-make" />
+      <plugin path="${artifacts.mps}/plugins/mps-rcp" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" />
       <plugin path="${artifacts.mps}/plugins/mps-tooltips" />
       <plugin path="${artifacts.mps}/plugins/mps-vcs" />
@@ -224,10 +228,6 @@
       <library file="${artifacts.mps}/languages/workbench-stub.jar" />
       <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
       <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
-      <library file="${artifacts.mps}/plugins/mps-vcs/languages/jetbrains.mps.ide.vcs.core.jar" />
-      <library file="${artifacts.mps}/plugins/mps-vcs/languages/jetbrains.mps.ide.vcs.modelmetadata.jar" />
-      <library file="${artifacts.mps}/plugins/mps-vcs/languages/jetbrains.mps.ide.vcs.platform.jar" />
-      <library file="${artifacts.mps}/plugins/mps-vcs/languages/jetbrains.mps.vcs.mergehints.runtime.jar" />
       <chunk>
         <module file="${sample.project}/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd" />
       </chunk>
@@ -272,10 +272,8 @@
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
@@ -288,15 +286,18 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
-        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
         <fileset file="${artifacts.mps}/lib/util.jar" />
-        <fileset file="${artifacts.mps}/lib/app.jar" />
+        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
         <fileset file="${artifacts.mps}/lib/java-impl.jar" />
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.blutil/languages/de.itemis.mps.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
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 dfd32fd3bba..7c19a82c262 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.tutorial.sample.buildProject" uuid="c0c8a343-7b6c-4182-b027-e640e8d3bed3" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.tutorial.sample.buildProject" uuid="c0c8a343-7b6c-4182-b027-e640e8d3bed3" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
     <dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
@@ -32,7 +31,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
     <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps
index 16c6e4bd06e..b560fb45d3d 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps
@@ -14,7 +14,7 @@
   </imports>
   <registry>
     <language id="92f195b6-a209-4804-ad65-f5248ecd5873" name="com.mbeddr.mpsutil.margincell">
-      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ng" index="3vooZZ">
+      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ngI" index="3vooZZ">
         <property id="8039098920897639409" name="attachedCellId" index="19LeSh" />
         <reference id="8039098920897680033" name="attachedNode" index="19LoX1" />
       </concept>
@@ -91,7 +91,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd
index 8a873fa63e5..099bfd1835b 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.tutorial.documentation" uuid="6067e76d-bebf-48a7-ba15-ee10a110b87e" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.tutorial.documentation" uuid="6067e76d-bebf-48a7-ba15-ee10a110b87e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">36a565f1-3fa0-42d6-baac-f87e209c9789(com.mbeddr.ext.components.mock)</dependency>
     <dependency reexport="false">b87ff58e-456e-4d51-9ed6-4090f4e7b51c(mbeddr.tutorial.main)</dependency>
@@ -73,7 +72,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -150,7 +149,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="b87ff58e-456e-4d51-9ed6-4090f4e7b51c(mbeddr.tutorial.main)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr
index 7616c855a38..b4350620828 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr
@@ -20,7 +20,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -46,7 +46,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -69,7 +69,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr
index 57198a4fbb4..5e17793e848 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr
@@ -19,7 +19,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -57,7 +57,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -82,7 +82,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr
index 1446e469a0c..2080c5653ea 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr
@@ -33,7 +33,7 @@
       <concept id="2179458690449473542" name="com.mbeddr.doc.structure.ModelContentEmbeddingPrefix" flags="ng" index="2CRZSB">
         <child id="2179458690449479999" name="prefix" index="2CRYsu" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -87,7 +87,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -121,7 +121,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr
index c5a7b1dff45..414af056354 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr
@@ -26,7 +26,7 @@
       <concept id="2179458690439382890" name="com.mbeddr.doc.structure.ConceptModelContentRemoval" flags="ng" index="2Cuv_b">
         <reference id="2179458690439403347" name="conceptDecl" index="2Cuq_M" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="126932837435370865" name="authors" index="Wq1Bf" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
@@ -82,7 +82,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -108,7 +108,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/Z_CHAPTER_CExtensions.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/Z_CHAPTER_CExtensions.mpsr
index 18140753903..ca93548ac9a 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/Z_CHAPTER_CExtensions.mpsr
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/Z_CHAPTER_CExtensions.mpsr
@@ -9,7 +9,7 @@
       <concept id="6165313375056012512" name="com.mbeddr.doc.structure.DocumentInclude" flags="ng" index="$CzcT">
         <child id="6165313375056012515" name="ref" index="$CzcU" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -17,7 +17,7 @@
       <concept id="3350625596580225385" name="com.mbeddr.doc.structure.DocumentRef" flags="ng" index="1_0j5j">
         <reference id="3350625596580225386" name="doc" index="1_0j5g" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -28,7 +28,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps
index 47e8d79b55c..c1ce0be6684 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps
@@ -66,7 +66,7 @@
       <concept id="6111466015651074424" name="com.mbeddr.ext.units.structure.EmptyUnitContainerContent" flags="ng" index="134lye" />
     </language>
     <language id="92f195b6-a209-4804-ad65-f5248ecd5873" name="com.mbeddr.mpsutil.margincell">
-      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ng" index="3vooZZ">
+      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ngI" index="3vooZZ">
         <property id="8039098920897639409" name="attachedCellId" index="19LeSh" />
         <reference id="8039098920897680033" name="attachedNode" index="19LoX1" />
       </concept>
@@ -91,7 +91,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -186,7 +186,7 @@
         <child id="8985851583396455257" name="varRef" index="2c3wGY" />
       </concept>
       <concept id="8985851583396455243" name="com.mbeddr.analyses.cbmc.structure.HarnessModule" flags="ng" index="2c3wGG" />
-      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ng" index="2lUzGJ">
+      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ngI" index="2lUzGJ">
         <property id="8327535879610783176" name="timeoutInSeconds" index="2l50Ka" />
         <property id="8327535879610783188" name="timeoutForSingleAnalysis" index="2l50Km" />
         <property id="8327535879610783118" name="hasLocalTimeout" index="2l50Lc" />
@@ -251,7 +251,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -277,7 +277,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -285,7 +285,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -426,7 +426,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -509,7 +509,7 @@
         <child id="6209278014151449965" name="to" index="3Z21gp" />
       </concept>
       <concept id="6209278014151449943" name="com.mbeddr.ext.components.structure.PsmNewState" flags="ng" index="3Z21gz" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -540,7 +540,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
@@ -549,7 +549,7 @@
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
       <concept id="22102029902365709" name="com.mbeddr.core.expressions.structure.AssignmentExpr" flags="ng" index="3pqW6w" />
       <concept id="4739982148980385695" name="com.mbeddr.core.expressions.structure.FloatType" flags="ng" index="3AreGT" />
-      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ng" index="1Ml8iu">
+      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ngI" index="1Ml8iu">
         <child id="7336544617004013388" name="valueType" index="UxbcT" />
       </concept>
       <concept id="6610873504380029780" name="com.mbeddr.core.expressions.structure.CastExpression" flags="ng" index="1S8S4T">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/complexProjects.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/complexProjects.mps
index b7941dd67ff..b47383f5996 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/complexProjects.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/complexProjects.mps
@@ -9,11 +9,11 @@
   </imports>
   <registry>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="4208238404730191274" name="com.mbeddr.doc.structure.Chapter" flags="ng" index="1mvXsy" />
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/installation.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/installation.mps
index 6443e91e982..658d044001d 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/installation.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/installation.mps
@@ -37,7 +37,7 @@
       <concept id="5785245534400277706" name="com.mbeddr.doc.structure.TextBlockTableCell" flags="ng" index="C7FVz">
         <child id="5785245534400277707" name="text" index="C7FVy" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -79,7 +79,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -104,7 +104,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd
index 900907dc98e..d3cc1afda69 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.tutorial.sample.CProject" uuid="2bd5059a-12b0-4f35-8cc0-1327110664f0" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.tutorial.sample.CProject" uuid="2bd5059a-12b0-4f35-8cc0-1327110664f0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -40,7 +39,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/models/com/mbeddr/tutorial/sample/CProject/main.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/models/com/mbeddr/tutorial/sample/CProject/main.mps
index c59d58e838d..e0cc5abd744 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/models/com/mbeddr/tutorial/sample/CProject/main.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/models/com/mbeddr/tutorial/sample/CProject/main.mps
@@ -35,7 +35,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -46,7 +46,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -55,7 +55,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -77,12 +77,12 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd
index ea8e1df82c5..7d1ccec4012 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.tutorial.sample.HelloWorld" uuid="bad0aced-d6d1-4cbd-bcd8-25e3a7603d5b" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.tutorial.sample.HelloWorld" uuid="bad0aced-d6d1-4cbd-bcd8-25e3a7603d5b" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -40,7 +39,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/models/com/mbeddr/tutorial/sample/HelloWorld/main.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/models/com/mbeddr/tutorial/sample/HelloWorld/main.mps
index e9d6d6c8088..2f5900f392a 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/models/com/mbeddr/tutorial/sample/HelloWorld/main.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/models/com/mbeddr/tutorial/sample/HelloWorld/main.mps
@@ -35,7 +35,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -46,7 +46,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -55,7 +55,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -79,7 +79,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
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 f92dd7c23da..66b42020c3d 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.tutorial.startup" uuid="b02ab9c3-2076-4e66-80c9-51404b9a741d" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.tutorial.startup" uuid="b02ab9c3-2076-4e66-80c9-51404b9a741d" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -21,13 +20,14 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">67506b1e-43ad-47fe-a8e6-bc7837e9e11f(com.mbeddr.mpsutil.editingGuide)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">cc99dce1-49f3-4392-8dbf-e22ca47bd0af(org.modelix.model.api)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -35,7 +35,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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -82,6 +82,7 @@
     <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="cc99dce1-49f3-4392-8dbf-e22ca47bd0af(org.modelix.model.api)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
index fed88b3002e..621dc9dbe07 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:03e4da46-ba58-40ce-9598-5e6712fb2436(com.mbeddr.tutorial.startup.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -26,9 +26,10 @@
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" />
     <import index="k8go" ref="r:00731b77-fd60-4ebd-b554-284dbff8495f(com.mbeddr.mpsutil.editingGuide.structure)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
+    <import index="v18h" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:kotlin(MPS.IDEA/)" />
+    <import index="ksrs" ref="cc99dce1-49f3-4392-8dbf-e22ca47bd0af/java:kotlin.coroutines(org.modelix.model.api/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
   </imports>
@@ -45,6 +46,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -65,7 +67,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -90,10 +92,11 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -134,15 +137,11 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -157,16 +156,18 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1154542696413" name="jetbrains.mps.baseLanguage.structure.ArrayCreatorWithInitializer" flags="nn" index="3g6Rrh">
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -174,15 +175,19 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="1171903862077" name="jetbrains.mps.baseLanguage.structure.LowerBoundType" flags="in" index="3qUtgH">
+        <child id="1171903869531" name="bound" index="3qUvdb" />
+      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -209,7 +214,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -237,9 +242,16 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="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="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
+        <property id="8575328350543493365" name="message" index="huDt6" />
+        <property id="2423417345669755629" name="filter" index="1eyWvh" />
+      </concept>
     </language>
   </registry>
   <node concept="2DaZZR" id="1ozDasHIaOc" />
@@ -249,32 +261,53 @@
       <property role="TrG5h" value="startupActivity" />
       <node concept="3Tm6S6" id="2QDtwSqEBso" role="1B3o_S" />
       <node concept="3uibUv" id="2QDtwSqEBAP" role="1tU5fm">
-        <ref role="3uigEE" to="v27p:~StartupActivity" resolve="StartupActivity" />
+        <ref role="3uigEE" to="v27p:~ProjectActivity" resolve="ProjectActivity" />
       </node>
       <node concept="2ShNRf" id="2QDtwSqEBBb" role="33vP2m">
         <node concept="YeOm9" id="2QDtwSqEGbV" role="2ShVmc">
           <node concept="1Y3b0j" id="2QDtwSqEGbY" role="YeSDq">
             <property role="2bfB8j" value="true" />
-            <ref role="1Y3XeK" to="v27p:~StartupActivity" resolve="StartupActivity" />
+            <ref role="1Y3XeK" to="v27p:~ProjectActivity" resolve="ProjectActivity" />
             <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
             <node concept="3Tm1VV" id="2QDtwSqEGbZ" role="1B3o_S" />
-            <node concept="3clFb_" id="2QDtwSqEGc0" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="runActivity" />
-              <property role="DiZV1" value="false" />
-              <property role="od$2w" value="false" />
-              <node concept="3Tm1VV" id="2QDtwSqEGc1" role="1B3o_S" />
-              <node concept="3cqZAl" id="2QDtwSqEGc3" role="3clF45" />
-              <node concept="37vLTG" id="2QDtwSqEGc4" role="3clF46">
+            <node concept="2tJIrI" id="1VcgOw5d5Xl" role="jymVt" />
+            <node concept="3clFb_" id="1VcgOw5d6yL" role="jymVt">
+              <property role="TrG5h" value="execute" />
+              <node concept="15s5l7" id="1VcgOw5dw_5" role="lGtFl">
+                <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Error: Method does not override method from its superclass&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/4540477783368646804]&quot;;" />
+                <property role="huDt6" value="Error: Method does not override method from its superclass" />
+              </node>
+              <node concept="3Tm1VV" id="1VcgOw5d6yM" role="1B3o_S" />
+              <node concept="2AHcQZ" id="1VcgOw5d6yO" role="2AJF6D">
+                <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+              </node>
+              <node concept="3uibUv" id="1VcgOw5d6yP" role="3clF45">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+              <node concept="37vLTG" id="1VcgOw5d6yQ" role="3clF46">
                 <property role="TrG5h" value="ideaProject" />
-                <node concept="3uibUv" id="2QDtwSqEGc5" role="1tU5fm">
+                <node concept="3uibUv" id="1VcgOw5d6yR" role="1tU5fm">
                   <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
                 </node>
-                <node concept="2AHcQZ" id="2QDtwSqEGc6" role="2AJF6D">
+                <node concept="2AHcQZ" id="1VcgOw5d6yS" role="2AJF6D">
                   <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
                 </node>
               </node>
-              <node concept="3clFbS" id="2QDtwSqEGc7" role="3clF47">
+              <node concept="37vLTG" id="1VcgOw5d6yT" role="3clF46">
+                <property role="TrG5h" value="continuation" />
+                <node concept="3uibUv" id="1VcgOw5d6yU" role="1tU5fm">
+                  <ref role="3uigEE" to="ksrs:~Continuation" resolve="Continuation" />
+                  <node concept="3qUtgH" id="1VcgOw5d6yV" role="11_B2D">
+                    <node concept="3uibUv" id="1VcgOw5d6yW" role="3qUvdb">
+                      <ref role="3uigEE" to="v18h:~Unit" resolve="Unit" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2AHcQZ" id="1VcgOw5d6yX" role="2AJF6D">
+                  <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="1VcgOw5d6yZ" role="3clF47">
                 <node concept="3cpWs8" id="2QDtwSqEJmP" role="3cqZAp">
                   <node concept="3cpWsn" id="2QDtwSqEJmQ" role="3cpWs9">
                     <property role="TrG5h" value="mpsProject" />
@@ -285,7 +318,7 @@
                       <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
                       <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
                       <node concept="37vLTw" id="2QDtwSqEJmS" role="37wK5m">
-                        <ref role="3cqZAo" node="2QDtwSqEGc4" resolve="ideaProject" />
+                        <ref role="3cqZAo" node="1VcgOw5d6yQ" resolve="ideaProject" />
                       </node>
                     </node>
                   </node>
@@ -590,8 +623,18 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3cpWs6" id="1VcgOw5dszP" role="3cqZAp">
+                  <node concept="10Nm6u" id="1VcgOw5dtlP" role="3cqZAk" />
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="1VcgOw5d6z0" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
               </node>
             </node>
+            <node concept="15s5l7" id="1VcgOw5dvVG" role="lGtFl">
+              <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Error: The anonymous class must implement abstract method 'execute' in 'ProjectActivity'&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/824450455578865184]&quot;;" />
+              <property role="huDt6" value="Error: The anonymous class must implement abstract method 'execute' in 'ProjectActivity'" />
+            </node>
           </node>
         </node>
       </node>
@@ -607,9 +650,14 @@
               </node>
               <node concept="liA8E" id="2QDtwSqEKem" role="2OqNvi">
                 <ref role="37wK5l" to="9ti4:~ExtensionsArea.getExtensionPoint(com.intellij.openapi.extensions.ExtensionPointName)" resolve="getExtensionPoint" />
-                <node concept="10M0yZ" id="2QDtwSqEKfi" role="37wK5m">
-                  <ref role="1PxDUh" to="v27p:~StartupActivity" resolve="StartupActivity" />
-                  <ref role="3cqZAo" to="v27p:~StartupActivity.POST_STARTUP_ACTIVITY" resolve="POST_STARTUP_ACTIVITY" />
+                <node concept="2OqwBi" id="inc7HFLyx6" role="37wK5m">
+                  <node concept="10M0yZ" id="inc7HFLyfE" role="2Oq$k0">
+                    <ref role="3cqZAo" to="v27p:~StartupActivity.Companion" resolve="Companion" />
+                    <ref role="1PxDUh" to="v27p:~StartupActivity" resolve="StartupActivity" />
+                  </node>
+                  <node concept="liA8E" id="inc7HFLyNA" role="2OqNvi">
+                    <ref role="37wK5l" to="v27p:~StartupActivity$Companion.getPOST_STARTUP_ACTIVITY()" resolve="getPOST_STARTUP_ACTIVITY" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -637,9 +685,14 @@
               </node>
               <node concept="liA8E" id="2QDtwSqEKzm" role="2OqNvi">
                 <ref role="37wK5l" to="9ti4:~ExtensionsArea.getExtensionPoint(com.intellij.openapi.extensions.ExtensionPointName)" resolve="getExtensionPoint" />
-                <node concept="10M0yZ" id="2QDtwSqEKzn" role="37wK5m">
-                  <ref role="3cqZAo" to="v27p:~StartupActivity.POST_STARTUP_ACTIVITY" resolve="POST_STARTUP_ACTIVITY" />
-                  <ref role="1PxDUh" to="v27p:~StartupActivity" resolve="StartupActivity" />
+                <node concept="2OqwBi" id="inc7HFLz7K" role="37wK5m">
+                  <node concept="10M0yZ" id="inc7HFLz7L" role="2Oq$k0">
+                    <ref role="3cqZAo" to="v27p:~StartupActivity.Companion" resolve="Companion" />
+                    <ref role="1PxDUh" to="v27p:~StartupActivity" resolve="StartupActivity" />
+                  </node>
+                  <node concept="liA8E" id="inc7HFLz7M" role="2OqNvi">
+                    <ref role="37wK5l" to="v27p:~StartupActivity$Companion.getPOST_STARTUP_ACTIVITY()" resolve="getPOST_STARTUP_ACTIVITY" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -660,6 +713,7 @@
   <node concept="sE7Ow" id="2QDtwSqDi2L">
     <property role="TrG5h" value="openEditingGuide" />
     <property role="2uzpH1" value="Editing Guide" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2QDtwSqDi2M" role="tncku">
       <node concept="3clFbS" id="2QDtwSqDi2N" role="2VODD2">
         <node concept="3cpWs8" id="2QDtwSqDju9" role="3cqZAp">
@@ -721,6 +775,7 @@
   <node concept="sE7Ow" id="2NmTaRWDjVL">
     <property role="TrG5h" value="openUserGUide" />
     <property role="2uzpH1" value="mbeddr User Guide" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2NmTaRWDjZk" role="tncku">
       <node concept="3clFbS" id="2NmTaRWDjZl" role="2VODD2">
         <node concept="1QHqEM" id="2T0maaexzml" role="3cqZAp">
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 dc6bed67d85..36cb83af38a 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.tutorial.main" uuid="b87ff58e-456e-4d51-9ed6-4090f4e7b51c" moduleVersion="0" compileInMPS="true">
+<solution name="mbeddr.tutorial.main" uuid="b87ff58e-456e-4d51-9ed6-4090f4e7b51c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -91,7 +90,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.complex_code.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.complex_code.mps
index f62b7de8e15..ce121cb627f 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.complex_code.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.complex_code.mps
@@ -26,7 +26,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -116,7 +116,7 @@
         <child id="8985851583396455257" name="varRef" index="2c3wGY" />
       </concept>
       <concept id="8985851583396455243" name="com.mbeddr.analyses.cbmc.structure.HarnessModule" flags="ng" index="2c3wGG" />
-      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ng" index="2lUzGJ">
+      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ngI" index="2lUzGJ">
         <property id="348741627183644680" name="hasLocalArchitectureSettings" index="22uFEx" />
         <property id="8327535879610783176" name="timeoutInSeconds" index="2l50Ka" />
         <property id="8327535879610783188" name="timeoutForSingleAnalysis" index="2l50Km" />
@@ -194,7 +194,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -233,10 +233,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -244,7 +244,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -285,7 +285,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -316,7 +316,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_01.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_01.mps
index a4556d58bb0..571ac3c4210 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_01.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_01.mps
@@ -15,7 +15,7 @@
       </concept>
     </language>
     <language id="92f195b6-a209-4804-ad65-f5248ecd5873" name="com.mbeddr.mpsutil.margincell">
-      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ng" index="3vooZZ">
+      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ngI" index="3vooZZ">
         <property id="8039098920897639409" name="attachedCellId" index="19LeSh" />
         <reference id="8039098920897680033" name="attachedNode" index="19LoX1" />
       </concept>
@@ -77,7 +77,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -96,7 +96,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -120,7 +120,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -128,7 +128,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -164,7 +164,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -175,7 +175,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_02.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_02.mps
index f28acea69b0..93154276690 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_02.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_02.mps
@@ -19,7 +19,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -84,7 +84,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -103,7 +103,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -133,7 +133,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -141,7 +141,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -167,7 +167,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -180,7 +180,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_03.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_03.mps
index 9916430dd7a..508dee97c24 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_03.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_03.mps
@@ -19,7 +19,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -84,7 +84,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -103,7 +103,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -130,7 +130,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -138,7 +138,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -164,7 +164,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -177,7 +177,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_04.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_04.mps
index 7c10e6f2ce7..d37dc9e4948 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_04.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_04.mps
@@ -63,7 +63,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -90,7 +90,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -114,7 +114,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -122,7 +122,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -151,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -161,7 +161,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_05.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_05.mps
index 2388218462c..d2c7219c87a 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_05.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_05.mps
@@ -28,7 +28,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -104,7 +104,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -126,7 +126,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -176,7 +176,7 @@
       <concept id="1028666136487545270" name="com.mbeddr.core.modules.structure.CommentModuleContent" flags="ng" index="2B_Gvg">
         <child id="1028666136487550078" name="text" index="2B_H8o" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -184,7 +184,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -215,7 +215,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -232,7 +232,7 @@
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_06.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_06.mps
index 22196e6894d..df16cf0098d 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_06.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_06.mps
@@ -19,7 +19,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -87,7 +87,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -106,7 +106,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -148,7 +148,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -156,7 +156,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -182,7 +182,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -198,7 +198,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_07.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_07.mps
index 26f58218bb8..a05f8d40cd7 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_07.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_07.mps
@@ -74,7 +74,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -93,7 +93,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -124,7 +124,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -132,7 +132,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -158,7 +158,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -176,7 +176,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_08.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_08.mps
index 561ced1236b..c370a63175a 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_08.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_08.mps
@@ -15,7 +15,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -87,7 +87,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -106,7 +106,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -145,14 +145,14 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -176,7 +176,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -191,7 +191,7 @@
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_09.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_09.mps
index 85f9d7e9da5..b793677466a 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_09.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_09.mps
@@ -19,7 +19,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -75,7 +75,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -97,7 +97,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -151,7 +151,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -159,7 +159,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -188,7 +188,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -202,7 +202,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_10.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_10.mps
index 5fddd1412f6..fc6edda9242 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_10.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc._010_tutorial.lesson_10.mps
@@ -71,7 +71,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -90,7 +90,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -114,7 +114,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -122,7 +122,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -151,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -170,7 +170,7 @@
       </concept>
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code.mps
index 21be96aa026..da471d4efec 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code.mps
@@ -16,7 +16,7 @@
       </concept>
     </language>
     <language id="92f195b6-a209-4804-ad65-f5248ecd5873" name="com.mbeddr.mpsutil.margincell">
-      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ng" index="3vooZZ">
+      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ngI" index="3vooZZ">
         <property id="8039098920897639409" name="attachedCellId" index="19LeSh" />
         <reference id="8039098920897680033" name="attachedNode" index="19LoX1" />
       </concept>
@@ -37,7 +37,7 @@
         <child id="3134547887598498471" name="body" index="gg_gl" />
         <child id="3134547887598498479" name="condition" index="gg_gt" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -151,7 +151,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -177,7 +177,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -252,10 +252,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -263,7 +263,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -306,7 +306,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -339,7 +339,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code_tests.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code_tests.mps
index dd34ee8b72d..9d05020583a 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code_tests.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.complex_code_tests.mps
@@ -21,7 +21,7 @@
       <concept id="8455208232410333108" name="com.mbeddr.mpsutil.review.annotation.structure.CommentAnnotationContainer" flags="ng" index="2f$52y" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -64,7 +64,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -95,7 +95,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -106,7 +106,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -114,7 +114,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -138,7 +138,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -153,7 +153,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="22102029902365709" name="com.mbeddr.core.expressions.structure.AssignmentExpr" flags="ng" index="3pqW6w" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.mps
index 383a7c7adc8..050e6c46c8a 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/analyses.mdcc.mps
@@ -38,7 +38,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -131,7 +131,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -150,7 +150,7 @@
         <property id="9065467049586938198" name="compilerOptions" index="1gr5cm" />
         <property id="9065467049586938199" name="make" index="1gr5cn" />
       </concept>
-      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ng" index="1Qv9iI">
+      <concept id="6386634687973783239" name="com.mbeddr.analyses.spin.structure.IPanRunSettings" flags="ngI" index="1Qv9iI">
         <property id="768608840052710411" name="stopAtFirstError" index="3SeVAx" />
       </concept>
     </language>
@@ -228,7 +228,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -236,7 +236,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -271,7 +271,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -299,7 +299,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses.mps
index e645d9116f6..4b0ac898ae0 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses.mps
@@ -83,7 +83,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -189,7 +189,7 @@
         <child id="8985851583396455257" name="varRef" index="2c3wGY" />
       </concept>
       <concept id="8985851583396455243" name="com.mbeddr.analyses.cbmc.structure.HarnessModule" flags="ng" index="2c3wGG" />
-      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ng" index="2lUzGJ">
+      <concept id="8327535879610131181" name="com.mbeddr.analyses.cbmc.structure.ICbmcSettings" flags="ngI" index="2lUzGJ">
         <property id="348741627183644680" name="hasLocalArchitectureSettings" index="22uFEx" />
         <property id="8327535879610783176" name="timeoutInSeconds" index="2l50Ka" />
         <property id="8327535879610783188" name="timeoutForSingleAnalysis" index="2l50Km" />
@@ -280,7 +280,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -297,7 +297,7 @@
       <concept id="3793213301909614895" name="com.mbeddr.analyses.acsl.structure.FunctionContract" flags="ng" index="2HfW99">
         <child id="3793213301909617373" name="functionContractMember" index="2HfWAV" />
       </concept>
-      <concept id="3793213301909615744" name="com.mbeddr.analyses.acsl.structure.IAtomicContract" flags="ng" index="2HfWvA">
+      <concept id="3793213301909615744" name="com.mbeddr.analyses.acsl.structure.IAtomicContract" flags="ngI" index="2HfWvA">
         <child id="75361647380517795" name="exp" index="3sLAUB" />
       </concept>
       <concept id="3793213301909615745" name="com.mbeddr.analyses.acsl.structure.Requires" flags="ng" index="2HfWvB" />
@@ -344,10 +344,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -355,7 +355,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -449,7 +449,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -544,7 +544,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses/brute_force.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses/brute_force.mps
index ca8e94566bf..a9107491266 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses/brute_force.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/analyses/brute_force.mps
@@ -11,7 +11,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -65,7 +65,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -103,7 +103,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -131,7 +131,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -139,7 +139,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -156,7 +156,7 @@
       <concept id="8610007178384196427" name="com.mbeddr.core.unittest.structure.UnitTestConfigItem" flags="ng" index="12mU2y" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -171,7 +171,7 @@
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="22102029902365709" name="com.mbeddr.core.expressions.structure.AssignmentExpr" flags="ng" index="3pqW6w" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/plainC.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/plainC.mps
index fa121ab56df..b4c2a6c980f 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/plainC.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/plainC.mps
@@ -17,7 +17,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -79,7 +79,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -120,7 +120,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -131,14 +131,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -180,7 +180,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -198,7 +198,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.build/.mps/migration.xml b/code/languages/com.mbeddr.build/.mps/migration.xml
index 273d8e8a3ee..65112394c89 100644
--- a/code/languages/com.mbeddr.build/.mps/migration.xml
+++ b/code/languages/com.mbeddr.build/.mps/migration.xml
@@ -20,6 +20,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -28,6 +30,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd
index d3d24bb599f..3e40eb0cc39 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.allScripts" uuid="752496a0-da43-4b5e-bd15-ea1a5aa211f6" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.allScripts" uuid="752496a0-da43-4b5e-bd15-ea1a5aa211f6" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
     <dependency reexport="false">bf659d6c-5638-4ea1-972b-4d492b5a91f2(jetbrains.mps.execution.configurations.implementation.plugin)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd
index 8a3c8ccd85a..3068926601d 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.build" uuid="7ac0dfb8-7d5f-4573-ab80-81af2106ce03" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.build" uuid="7ac0dfb8-7d5f-4573-ab80-81af2106ce03" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
     <dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
index 82e4229203c..437a514f571 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
@@ -89,7 +89,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
@@ -105,7 +105,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd
index 5143452b281..fdacedd0a32 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.tests.dev.build" uuid="ffd31df9-5187-4c9a-bb4f-d84e5f59ffd5" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.cc.tests.dev.build" uuid="ffd31df9-5187-4c9a-bb4f-d84e5f59ffd5" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd
index 1fb5d13c8f0..3822e5461d0 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.tests.build" uuid="d47a3921-8b42-4664-bed6-25e3e4fd6efb" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.core.tests.build" uuid="d47a3921-8b42-4664-bed6-25e3e4fd6efb" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps
index cee127fade8..19ff50bb0c4 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps
@@ -1051,6 +1051,22 @@
             <ref role="3bR37D" node="5Z2CJwRopt8" resolve="test.assessments.testlang" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4mvQA9n$oM$" role="3bR31x">
+          <node concept="3LXTmp" id="4mvQA9n$oM_" role="3rtmxm">
+            <node concept="3qWCbU" id="4mvQA9n$oMA" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="4mvQA9n$oMB" role="3LXTmr">
+              <ref role="398BVh" node="7eF9rfAuuux" resolve="mbeddr.core" />
+              <node concept="2Ry0Ak" id="4mvQA9n$oMC" role="iGT6I">
+                <property role="2Ry0Am" value="tests" />
+                <node concept="2Ry0Ak" id="4mvQA9n$oMD" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.assessments" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="398rNT" id="7eF9rfAuuuc" role="1l3spd">
@@ -1158,10 +1174,10 @@
     </node>
     <node concept="22LTRH" id="7eF9rfAuuvf" role="1hWBAP">
       <property role="TrG5h" value="com.mbeddr.core.tests" />
-      <node concept="24cAiW" id="76N1O$Kj6vr" role="24cAkG" />
       <node concept="22LTRF" id="5Z2CJwRoMT1" role="22LTRK">
         <ref role="22LTRG" node="7eF9rfAuutn" resolve="com.mbeddr.core.tests" />
       </node>
+      <node concept="24cAiW" id="76N1O$Kj6vr" role="24cAkG" />
     </node>
   </node>
   <node concept="1l3spW" id="58DJDcMhr5Y">
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd
index 39a2d57be42..a28a2ae376a 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.tests.performance.build" uuid="b4b96a11-a253-4152-8bd6-6444c1b087e8" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.core.tests.performance.build" uuid="b4b96a11-a253-4152-8bd6-6444c1b087e8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd
index 5c0de5c5218..4b5284f403d 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.tests.build" uuid="06f4ccb3-313d-4d48-9667-87a8fb963fb2" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.ext.tests.build" uuid="06f4ccb3-313d-4d48-9667-87a8fb963fb2" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd
index 8dd00b2f566..9afa90ff423 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.platform.tests.build" uuid="c0ea564d-353d-4607-8b37-02e98106a159" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.platform.tests.build" uuid="c0ea564d-353d-4607-8b37-02e98106a159" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
index 3ed81f7e8e8..d33a91864bf 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
@@ -477,6 +477,22 @@
             <ref role="3bR37D" to="ffeo:rD7wKO5Iy" resolve="MPS.TextGen" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4mvQA9n$oMU" role="3bR31x">
+          <node concept="3LXTmp" id="4mvQA9n$oMV" role="3rtmxm">
+            <node concept="3qWCbU" id="4mvQA9n$oMW" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="4mvQA9n$oMX" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="4mvQA9n$oMY" role="iGT6I">
+                <property role="2Ry0Am" value="tests" />
+                <node concept="2Ry0Ak" id="4mvQA9n$oMZ" role="2Ry0An">
+                  <property role="2Ry0Am" value="tests.com.mbeddr.mpsutil.json" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4BxzwLdy2a8" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -537,6 +553,22 @@
             <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4mvQA9n$oN1" role="3bR31x">
+          <node concept="3LXTmp" id="4mvQA9n$oN2" role="3rtmxm">
+            <node concept="3qWCbU" id="4mvQA9n$oN3" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="4mvQA9n$oN4" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="4mvQA9n$oN5" role="iGT6I">
+                <property role="2Ry0Am" value="tests" />
+                <node concept="2Ry0Ak" id="4mvQA9n$oN6" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.contextactions" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7hVsScEQJs4" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd
index 02a86344980..f0fe984a452 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.platform" uuid="3ae9cfda-f938-4524-b4ca-fbcba3b0525b" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.platform" uuid="3ae9cfda-f938-4524-b4ca-fbcba3b0525b" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
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 bd12f6d19f7..7f99cd0a01f 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
@@ -92,7 +92,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="5610619299013057363" name="jetbrains.mps.build.structure.BuildLayout_ImportContent" flags="ng" index="3ygNvl">
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="3717301156197626279" name="jetbrains.mps.lang.core.structure.BasePlaceholder" flags="ng" index="3DQ70j">
@@ -1166,6 +1166,12 @@
               <property role="2pMdty" value="com.mbeddr.mpsutil.actionsfilter.runtime.ActionsConfigurable" />
             </node>
           </node>
+          <node concept="2pNUuL" id="2U2S4jsi1ue" role="2pNNFR">
+            <property role="2pNUuO" value="displayName" />
+            <node concept="2pMdtt" id="2U2S4jsi1uf" role="2pMdts">
+              <property role="2pMdty" value="Actions" />
+            </node>
+          </node>
         </node>
         <node concept="2pNUuL" id="7L_Y3n_ffhM" role="2pNNFR">
           <property role="2pNUuO" value="defaultExtensionNs" />
@@ -3208,7 +3214,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="org.apache.batik" />
         <property role="3LESm3" value="5ad14eca-28d7-4bce-b8e0-648908a49062" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="35JynOkFAzm" role="3LF7KH">
           <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
           <node concept="2Ry0Ak" id="35JynOkFBaE" role="iGT6I">
@@ -9193,6 +9198,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="7oqPIEqOzBc" role="3bR37C">
+          <node concept="3bR9La" id="7oqPIEqOzBd" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5GUwywcVavP" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -9990,6 +10000,11 @@
               <ref role="3bR37D" node="7vUP_qcXA_1" resolve="com.mbeddr.mpsutil.contextactions" />
             </node>
           </node>
+          <node concept="1SiIV0" id="1Tx15Zbwon" role="3bR37C">
+            <node concept="3bR9La" id="1Tx15Zbwoo" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:4X1d9kMCbcv" resolve="jetbrains.mps.ide.refactoring.platform" />
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="tZiUABOeu8" role="3bR37C">
           <node concept="3bR9La" id="tZiUABOeu9" role="1SiIV1">
@@ -12125,8 +12140,8 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="1VRNFInk6Og" role="3bR37C">
-          <node concept="3bR9La" id="1VRNFInk6Oh" role="1SiIV1">
+        <node concept="1SiIV0" id="6lcdwS9PFFU" role="3bR37C">
+          <node concept="3bR9La" id="6lcdwS9PFFV" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:HHlBn9$wJ2" resolve="org.jdom" />
           </node>
         </node>
@@ -16245,8 +16260,8 @@
             <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1VRNFInk6YH" role="3bR37C">
-          <node concept="3bR9La" id="1VRNFInk6YI" role="1SiIV1">
+        <node concept="1SiIV0" id="6lcdwS9PGDu" role="3bR37C">
+          <node concept="3bR9La" id="6lcdwS9PGDv" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:HHlBn9$wJ2" resolve="org.jdom" />
           </node>
         </node>
@@ -16489,6 +16504,11 @@
             <ref role="3bR37D" to="ffeo:5cCcm$KATVz" resolve="jetbrains.mps.lang.migration.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1C4$Mxwyf9e" role="3bR37C">
+          <node concept="3bR9La" id="1C4$Mxwyf9f" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Nsh5Tc2mTg" role="3989C9">
@@ -17817,7 +17837,6 @@
         </node>
       </node>
       <node concept="1E1JtD" id="4aKYPQyr67s" role="2G$12L">
-        <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mbeddr.spreadsheat" />
         <property role="3LESm3" value="1d891f7b-dc93-42f9-a4bc-b016656b14e2" />
         <node concept="3rtmxn" id="3xFG3bj5cXc" role="3bR31x">
@@ -17877,44 +17896,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6qrqamSa6lo" role="3bR37C">
-          <node concept="1BurEX" id="6qrqamSa6lp" role="1SiIV1">
-            <node concept="398BVA" id="6qrqamSa6lb" role="1BurEY">
-              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
-              <node concept="2Ry0Ak" id="6qrqamSa6lc" role="iGT6I">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="6qrqamSa6ld" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
-                  <node concept="2Ry0Ak" id="6qrqamSa6le" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="6qrqamSa6lf" role="2Ry0An">
-                      <property role="2Ry0Am" value="commons-collections4-4.1.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="6qrqamSa6lB" role="3bR37C">
-          <node concept="1BurEX" id="6qrqamSa6lC" role="1SiIV1">
-            <node concept="398BVA" id="6qrqamSa6lq" role="1BurEY">
-              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
-              <node concept="2Ry0Ak" id="6qrqamSa6lr" role="iGT6I">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="6qrqamSa6ls" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
-                  <node concept="2Ry0Ak" id="6qrqamSa6lt" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="6qrqamSa6lu" role="2Ry0An">
-                      <property role="2Ry0Am" value="curvesapi-1.04.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="6qrqamSa6lQ" role="3bR37C">
           <node concept="1BurEX" id="6qrqamSa6lR" role="1SiIV1">
             <node concept="398BVA" id="6qrqamSa6lD" role="1BurEY">
@@ -18052,6 +18033,310 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="7nFSfz7_8Iv" role="3bR37C">
+          <node concept="1BurEX" id="7nFSfz7_8Iw" role="1SiIV1">
+            <node concept="398BVA" id="7nFSfz7_8Ii" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="7nFSfz7_8Ij" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7nFSfz7_8Ik" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="7nFSfz7_8Il" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="7nFSfz7_8Im" role="2Ry0An">
+                      <property role="2Ry0Am" value="commons-collections4-4.1.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7nFSfz7_8II" role="3bR37C">
+          <node concept="1BurEX" id="7nFSfz7_8IJ" role="1SiIV1">
+            <node concept="398BVA" id="7nFSfz7_8Ix" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="7nFSfz7_8Iy" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7nFSfz7_8Iz" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="7nFSfz7_8I$" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="7nFSfz7_8I_" role="2Ry0An">
+                      <property role="2Ry0Am" value="curvesapi-1.04.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyfej" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyfek" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyfe6" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyfe7" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyfe8" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyfe9" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyfea" role="2Ry0An">
+                      <property role="2Ry0Am" value="commons-codec-1.10.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyfey" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyfez" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyfel" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyfem" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyfen" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyfeo" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyfep" role="2Ry0An">
+                      <property role="2Ry0Am" value="commons-collections4-4.1.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$MxwyfeL" role="3bR37C">
+          <node concept="1BurEX" id="1C4$MxwyfeM" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyfe$" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyfe_" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$MxwyfeA" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$MxwyfeB" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$MxwyfeC" role="2Ry0An">
+                      <property role="2Ry0Am" value="curvesapi-1.04.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyff0" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyff1" role="1SiIV1">
+            <node concept="398BVA" id="1C4$MxwyfeN" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$MxwyfeO" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$MxwyfeP" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$MxwyfeQ" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$MxwyfeR" role="2Ry0An">
+                      <property role="2Ry0Am" value="poi-5.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyfff" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyffg" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyff2" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyff3" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyff4" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyff5" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyff6" role="2Ry0An">
+                      <property role="2Ry0Am" value="poi-ooxml-5.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyffu" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyffv" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyffh" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyffi" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyffj" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyffk" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyffl" role="2Ry0An">
+                      <property role="2Ry0Am" value="xmlbeans-4.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$MxwyffH" role="3bR37C">
+          <node concept="1BurEX" id="1C4$MxwyffI" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyffw" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyffx" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyffy" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyffz" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyff$" role="2Ry0An">
+                      <property role="2Ry0Am" value="poi-ooxml-lite-5.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$MxwyffW" role="3bR37C">
+          <node concept="1BurEX" id="1C4$MxwyffX" role="1SiIV1">
+            <node concept="398BVA" id="1C4$MxwyffJ" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$MxwyffK" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$MxwyffL" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$MxwyffM" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$MxwyffN" role="2Ry0An">
+                      <property role="2Ry0Am" value="commons-codec-1.10.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyfgb" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyfgc" role="1SiIV1">
+            <node concept="398BVA" id="1C4$MxwyffY" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$MxwyffZ" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyfg0" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyfg1" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyfg2" role="2Ry0An">
+                      <property role="2Ry0Am" value="commons-collections4-4.1.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyfgq" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyfgr" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyfgd" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyfge" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyfgf" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyfgg" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyfgh" role="2Ry0An">
+                      <property role="2Ry0Am" value="curvesapi-1.04.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$MxwyfgD" role="3bR37C">
+          <node concept="1BurEX" id="1C4$MxwyfgE" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyfgs" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyfgt" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyfgu" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyfgv" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyfgw" role="2Ry0An">
+                      <property role="2Ry0Am" value="poi-5.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$MxwyfgS" role="3bR37C">
+          <node concept="1BurEX" id="1C4$MxwyfgT" role="1SiIV1">
+            <node concept="398BVA" id="1C4$MxwyfgF" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$MxwyfgG" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$MxwyfgH" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$MxwyfgI" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$MxwyfgJ" role="2Ry0An">
+                      <property role="2Ry0Am" value="poi-ooxml-5.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyfh7" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyfh8" role="1SiIV1">
+            <node concept="398BVA" id="1C4$MxwyfgU" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$MxwyfgV" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$MxwyfgW" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$MxwyfgX" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$MxwyfgY" role="2Ry0An">
+                      <property role="2Ry0Am" value="xmlbeans-4.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1C4$Mxwyfhm" role="3bR37C">
+          <node concept="1BurEX" id="1C4$Mxwyfhn" role="1SiIV1">
+            <node concept="398BVA" id="1C4$Mxwyfh9" role="1BurEY">
+              <ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
+              <node concept="2Ry0Ak" id="1C4$Mxwyfha" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1C4$Mxwyfhb" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
+                  <node concept="2Ry0Ak" id="1C4$Mxwyfhc" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="1C4$Mxwyfhd" role="2Ry0An">
+                      <property role="2Ry0Am" value="poi-ooxml-lite-5.0.0.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5xsBLDL_TZv" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -19197,7 +19482,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.opencsv" />
         <property role="3LESm3" value="11045775-3aaf-4816-8077-8656c4e8fee1" />
-        <property role="2GAjPV" value="true" />
         <node concept="3rtmxn" id="3xFG3bj5cU1" role="3bR31x">
           <node concept="3LXTmp" id="3xFG3bj5cU2" role="3rtmxm">
             <node concept="3qWCbU" id="3xFG3bj5cU3" role="3LXTna">
@@ -21069,32 +21353,19 @@
             </node>
           </node>
         </node>
-        <node concept="1yeLz9" id="4NrQZGe5U1D" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.mpsutil.editor.displayControl.generator" />
-          <property role="3LESm3" value="7baca8d9-1e65-4b72-acc7-0b1a931f21a4" />
-          <node concept="1BupzO" id="4NrQZGe5U1R" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="4NrQZGe5U1S" role="1HemKq">
-              <node concept="398BVA" id="4NrQZGe5U1E" role="3LXTmr">
-                <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-                <node concept="2Ry0Ak" id="4NrQZGe5U1F" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="4NrQZGe5U1G" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.mpsutil.editor.displayControl" />
-                    <node concept="2Ry0Ak" id="4NrQZGe5U1H" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="4NrQZGe5U1I" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
+        <node concept="3rtmxn" id="4mvQA9n$oN8" role="3bR31x">
+          <node concept="3LXTmp" id="4mvQA9n$oN9" role="3rtmxm">
+            <node concept="3qWCbU" id="4mvQA9n$oNa" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="4mvQA9n$oNb" role="3LXTmr">
+              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
+              <node concept="2Ry0Ak" id="4mvQA9n$oNc" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4mvQA9n$oNd" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.editor.displayControl" />
                 </node>
               </node>
-              <node concept="3qWCbU" id="4NrQZGe5U1T" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
             </node>
           </node>
         </node>
@@ -21178,6 +21449,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="4mvQA9n$oNf" role="3bR31x">
+          <node concept="3LXTmp" id="4mvQA9n$oNg" role="3rtmxm">
+            <node concept="3qWCbU" id="4mvQA9n$oNh" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="4mvQA9n$oNi" role="3LXTmr">
+              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
+              <node concept="2Ry0Ak" id="4mvQA9n$oNj" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4mvQA9n$oNk" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="3lcj7hzsuXf" role="3989C9">
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd
index a2f658691f7..5be70f85906 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.build.templates" uuid="0aeac08c-f139-42fc-a1b1-4d5d4be79e25" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.build.templates" uuid="0aeac08c-f139-42fc-a1b1-4d5d4be79e25" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd
index aba0aa6c569..2d89d95c5d1 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.xmodel.build" uuid="f784c90b-1ff6-440a-9cf3-266de03c53ec" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.xmodel.build" uuid="f784c90b-1ff6-440a-9cf3-266de03c53ec" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/languages/com.mbeddr.cc/.mps/migration.xml b/code/languages/com.mbeddr.cc/.mps/migration.xml
index 273d8e8a3ee..65112394c89 100644
--- a/code/languages/com.mbeddr.cc/.mps/migration.xml
+++ b/code/languages/com.mbeddr.cc/.mps/migration.xml
@@ -20,6 +20,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -28,6 +30,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd
index ce06427060b..813bd6b25c5 100644
--- a/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.cc.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.cc.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.cc.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/models/com/mbeddr/cc/__spreferences/PlatformTemplates.mps b/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/models/com/mbeddr/cc/__spreferences/PlatformTemplates.mps
index d6314fbf466..9b02c7bcb4d 100644
--- a/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/models/com/mbeddr/cc/__spreferences/PlatformTemplates.mps
+++ b/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/models/com/mbeddr/cc/__spreferences/PlatformTemplates.mps
@@ -23,12 +23,12 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd
index bfb26b08c2d..9f1bbb7cb40 100644
--- a/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd
+++ b/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.cc.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.cc.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.cc.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd
index 6d31507e83a..f5bbc058a4f 100644
--- a/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.cc.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.cc.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.cc.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl
index 0261c20b391..3a774d53d54 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl
@@ -39,7 +39,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -109,7 +109,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -143,7 +142,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -169,7 +167,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -190,7 +188,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -261,7 +259,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/generator/template/com/mbeddr/cc/requirements/c/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/generator/template/com/mbeddr/cc/requirements/c/generator/template/main@generator.mps
index c383e76f130..3acd3adcae6 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/generator/template/com/mbeddr/cc/requirements/c/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/generator/template/com/mbeddr/cc/requirements/c/generator/template/main@generator.mps
@@ -45,7 +45,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -130,7 +130,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/behavior.mps
index 03aa9684585..6fcabef9928 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/behavior.mps
@@ -119,7 +119,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -130,7 +130,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -195,7 +195,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/constraints.mps
index 1b060f32510..6774fc5deb3 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/constraints.mps
@@ -66,7 +66,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -152,7 +152,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/editor.mps
index a8f499b32b6..afd98c8f8e2 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/editor.mps
@@ -103,10 +103,10 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -146,7 +146,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -160,7 +160,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -189,7 +189,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -278,7 +278,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -295,7 +295,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -316,6 +316,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -367,7 +368,7 @@
         <child id="8155811638124638369" name="groupHeader" index="18hjfo" />
         <child id="8155811638124638371" name="childHeaders" index="18hjfq" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG" />
@@ -434,7 +435,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -453,7 +454,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1030,7 +1030,7 @@
                               </node>
                               <node concept="2OqwBi" id="1zEStSSvjWU" role="3uHU7B">
                                 <node concept="37vLTw" id="1zEStSSviP3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1zEStSSvh1d" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1rI" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1zEStSSvogm" role="2OqNvi">
                                   <ref role="3Tt5mk" to="3vkx:2A5UqXKPp2Z" resolve="country" />
@@ -1039,9 +1039,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1zEStSSvh1d" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1rI" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1zEStSSvh1e" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1rJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1157,7 +1157,7 @@
                             </node>
                             <node concept="2OqwBi" id="2A5UqXKQOld" role="3uHU7B">
                               <node concept="37vLTw" id="2A5UqXKQNQc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2A5UqXKQIRM" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1rK" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2A5UqXKQPYD" role="2OqNvi">
                                 <ref role="3Tt5mk" to="3vkx:2A5UqXKPp34" resolve="group" />
@@ -1167,7 +1167,7 @@
                           <node concept="3clFbC" id="2A5UqXKQMzV" role="3uHU7B">
                             <node concept="2OqwBi" id="2A5UqXKQJHd" role="3uHU7B">
                               <node concept="37vLTw" id="2A5UqXKQJ$h" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2A5UqXKQIRM" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1rK" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2A5UqXKQL8l" role="2OqNvi">
                                 <ref role="3Tt5mk" to="3vkx:2A5UqXKPp2Z" resolve="country" />
@@ -1180,9 +1180,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2A5UqXKQIRM" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1rK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2A5UqXKQIRN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1rL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1580,7 +1580,7 @@
                               </node>
                               <node concept="2OqwBi" id="1zEStSSvup9" role="3uHU7B">
                                 <node concept="37vLTw" id="1zEStSSvupa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1zEStSSvupc" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1rM" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1zEStSSvBji" role="2OqNvi">
                                   <ref role="3Tt5mk" to="3vkx:2A5UqXKPp34" resolve="group" />
@@ -1589,9 +1589,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1zEStSSvupc" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1rM" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1zEStSSvupd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1rN" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps
index b4c1b862e94..3f1dc33ad4a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps
@@ -43,7 +43,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -140,7 +140,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -161,7 +161,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -239,7 +239,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -801,11 +801,11 @@
                 <node concept="1pGfFk" id="jgTeXj2AHS" role="2ShVmc">
                   <ref role="37wK5l" to="2ahs:2yaxsm5jILI" resolve="CombinedInterpreter" />
                   <node concept="2OqwBi" id="2PA_oGfbOk5" role="37wK5m">
+                    <node concept="3_kTaI" id="2PA_oGfbQWl" role="2OqNvi" />
                     <node concept="2YIFZM" id="2PA_oGfbFGC" role="2Oq$k0">
                       <ref role="37wK5l" to="2ahs:2PA_oGfak8K" resolve="findAllInterpreterExecutables" />
                       <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
                     </node>
-                    <node concept="3_kTaI" id="2PA_oGfbQWl" role="2OqNvi" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/plugin.mps
index 94f7698541f..be2c1c769bc 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:6a61a438-6bf3-4019-9fa5-9940abf5f049(com.mbeddr.cc.requirements.c.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/structure.mps
index 32b7ca9e3a6..0dba5c5f840 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/structure.mps
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/typesystem.mps
index 8b6b106e44a..57f98d6bb7e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/typesystem.mps
@@ -81,7 +81,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -172,7 +172,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl
index de3341e9b4d..2f36dc71cb3 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl
@@ -40,7 +40,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -105,7 +105,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
   </dependencies>
@@ -113,7 +112,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/generator/template/com/mbeddr/cc/requirements/c2doc/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/generator/template/com/mbeddr/cc/requirements/c2doc/generator/template/main@generator.mps
index edc597da7fd..d7a46a5e1c7 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/generator/template/com/mbeddr/cc/requirements/c2doc/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/generator/template/com/mbeddr/cc/requirements/c2doc/generator/template/main@generator.mps
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,7 +95,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596579911728" name="com.mbeddr.doc.structure.Document" flags="ng" index="1_1swa" />
@@ -169,7 +169,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/languageModels/structure.mps
index 82212ad98de..769e96dc760 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/languageModels/structure.mps
@@ -25,7 +25,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl
index 32cfd70a20c..f7e26e58434 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -23,7 +22,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/behavior.mps
index 6b48948e105..78b242f20d7 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/behavior.mps
@@ -83,7 +83,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -91,7 +91,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -105,7 +105,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/editor.mps
index 35c4e1054fa..8c11672b716 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/editor.mps
@@ -53,7 +53,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -164,7 +164,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -185,7 +185,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -197,6 +197,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -218,7 +219,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -229,7 +230,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -674,7 +674,7 @@
                                       <node concept="10Nm6u" id="vcqV8fDzXi" role="3uHU7w" />
                                       <node concept="2OqwBi" id="vcqV8fDzXj" role="3uHU7B">
                                         <node concept="37vLTw" id="vcqV8fDzXk" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="vcqV8fDzXs" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1s1" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="vcqV8fDzXl" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -684,7 +684,7 @@
                                     <node concept="2OqwBi" id="vcqV8fDzXm" role="3uHU7w">
                                       <node concept="2OqwBi" id="vcqV8fDzXn" role="2Oq$k0">
                                         <node concept="37vLTw" id="vcqV8fDzXo" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="vcqV8fDzXs" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1s1" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="vcqV8fDzXp" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -700,9 +700,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="vcqV8fDzXs" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1s1" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="vcqV8fDzXt" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1s2" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/intentions.mps
index df026558f85..786c2d8c3c5 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/intentions.mps
@@ -67,7 +67,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -145,7 +145,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/structure.mps
index 9f3f50cc1c6..97f5470de09 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/languageModels/structure.mps
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl
index 7008ece838f..84cee757842 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl
@@ -47,7 +47,7 @@
         <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -150,7 +150,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e865cad2-7cc8-437a-951a-665bcbcb8b1a(com.mbeddr.cc.requirements)</dependency>
   </dependencies>
@@ -161,7 +160,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/req2doc/util.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/req2doc/util.mps
index dc0831b9b2a..316522bfa88 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/req2doc/util.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/req2doc/util.mps
@@ -26,7 +26,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -103,7 +103,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -121,13 +121,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -167,7 +168,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -191,7 +192,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -321,7 +321,7 @@
                         <node concept="3Tqbb2" id="1Ta4fAPH55T" role="1tU5fm" />
                         <node concept="2OqwBi" id="1Ta4fAPH55P" role="33vP2m">
                           <node concept="37vLTw" id="1Ta4fAPH55Q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1Ta4fAPH54Q" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1s7" resolve="it" />
                           </node>
                           <node concept="liA8E" id="1Ta4fAPH55R" role="2OqNvi">
                             <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -347,9 +347,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1Ta4fAPH54Q" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1s7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1Ta4fAPH54R" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1s8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -363,7 +363,7 @@
                       <node concept="3Tqbb2" id="519ky_So5$k" role="1tU5fm" />
                       <node concept="2OqwBi" id="519ky_So5$g" role="33vP2m">
                         <node concept="37vLTw" id="519ky_So5$h" role="2Oq$k0">
-                          <ref role="3cqZAo" node="519ky_So5zl" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1s9" resolve="it" />
                         </node>
                         <node concept="liA8E" id="519ky_So5$i" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -386,9 +386,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="519ky_So5zl" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1s9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="519ky_So5zm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1sa" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -501,7 +501,7 @@
                       <node concept="3fqX7Q" id="2AZbPfOuyTl" role="3clFbG">
                         <node concept="2OqwBi" id="2AZbPfOuyTn" role="3fr31v">
                           <node concept="37vLTw" id="2AZbPfOuyTo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2AZbPfOuxf$" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1sb" resolve="it" />
                           </node>
                           <node concept="liA8E" id="2AZbPfOuyTp" role="2OqNvi">
                             <ref role="37wK5l" to="lui2:~SModule.isPackaged()" resolve="isPackaged" />
@@ -510,9 +510,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2AZbPfOuxf$" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1sb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2AZbPfOuxf_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1sc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -572,7 +572,7 @@
                         <node concept="2OqwBi" id="2AZbPfOJ_K7" role="33vP2m">
                           <node concept="2JrnkZ" id="2AZbPfOJ_K8" role="2Oq$k0">
                             <node concept="37vLTw" id="2AZbPfOJ_K9" role="2JrQYb">
-                              <ref role="3cqZAo" node="2AZbPfOHYAu" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1sd" resolve="it" />
                             </node>
                           </node>
                           <node concept="liA8E" id="2AZbPfOJ_Ka" role="2OqNvi">
@@ -592,9 +592,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2AZbPfOHYAu" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1sd" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2AZbPfOHYAv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1se" role="1tU5fm" />
                   </node>
                 </node>
               </node>
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 9dab6baaffd..302e8254879 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
@@ -268,6 +268,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -388,7 +389,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -625,7 +625,7 @@
                                   <node concept="1PxgMI" id="2U5fsQemwHX" role="33vP2m">
                                     <node concept="2OqwBi" id="2U5fsQemwG0" role="1m5AlR">
                                       <node concept="37vLTw" id="2U5fsQemwG1" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2U5fsQemwED" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1sf" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="2U5fsQemwG2" role="2OqNvi">
                                         <ref role="37wK5l" to="xvsr:7MGLj3bS6ON" resolve="firstTagForConcept" />
@@ -666,9 +666,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2U5fsQemwED" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1sf" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2U5fsQemwEE" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1sg" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1019,7 +1019,7 @@
                                     <node concept="1PxgMI" id="5cV09KeFfA$" role="33vP2m">
                                       <node concept="2OqwBi" id="5cV09KeFfA_" role="1m5AlR">
                                         <node concept="37vLTw" id="5cV09KeFfAA" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5cV09KeFfAO" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1sh" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="5cV09KeFfAB" role="2OqNvi">
                                           <ref role="37wK5l" to="xvsr:7MGLj3bS6ON" resolve="firstTagForConcept" />
@@ -1060,9 +1060,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5cV09KeFfAO" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1sh" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="5cV09KeFfAP" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1si" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2072,7 +2072,7 @@
                       <node concept="2OqwBi" id="2U5fsQejMIk" role="3clFbG">
                         <node concept="2OqwBi" id="2U5fsQejMIl" role="2Oq$k0">
                           <node concept="37vLTw" id="2U5fsQejMIm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2U5fsQejMIr" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1sj" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="2U5fsQejMIn" role="2OqNvi">
                             <node concept="1xMEDy" id="2U5fsQejMIo" role="1xVPHs">
@@ -2088,9 +2088,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2U5fsQejMIr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1sj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2U5fsQejMIs" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1sk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2115,7 +2115,7 @@
                     <node concept="3clFbF" id="2U5fsQejO$K" role="3cqZAp">
                       <node concept="2OqwBi" id="2U5fsQejO$L" role="3clFbG">
                         <node concept="37vLTw" id="2U5fsQejO$M" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2U5fsQejO$O" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1sl" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2U5fsQejO$N" role="2OqNvi">
                           <ref role="3Tt5mk" to="2c95:5L$H31Kgq3g" resolve="config" />
@@ -2123,9 +2123,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2U5fsQejO$O" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1sl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2U5fsQejO$P" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1sm" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2150,7 +2150,7 @@
                     <node concept="3clFbF" id="2U5fsQejMOc" role="3cqZAp">
                       <node concept="2OqwBi" id="2U5fsQejMOd" role="3clFbG">
                         <node concept="37vLTw" id="2U5fsQejMOe" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2U5fsQejMOi" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1sn" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="2U5fsQejMOf" role="2OqNvi">
                           <node concept="1xMEDy" id="2U5fsQejMOg" role="1xVPHs">
@@ -2162,9 +2162,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2U5fsQejMOi" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1sn" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2U5fsQejMOj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1so" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2242,7 +2242,7 @@
                         <node concept="2OqwBi" id="2U5fsQejMSz" role="3clFbG">
                           <node concept="2OqwBi" id="2U5fsQejMS4" role="2Oq$k0">
                             <node concept="37vLTw" id="2U5fsQejMRJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2U5fsQejMRG" resolve="m" />
+                              <ref role="3cqZAo" node="2SR9xrsN1sr" resolve="m" />
                             </node>
                             <node concept="2Rf3mk" id="2U5fsQejMSa" role="2OqNvi">
                               <node concept="1xMEDy" id="2U5fsQejMSb" role="1xVPHs">
@@ -2258,24 +2258,24 @@
                                 <node concept="3clFbF" id="2U5fsQejMSJ" role="3cqZAp">
                                   <node concept="2OqwBi" id="2U5fsQejMT5" role="3clFbG">
                                     <node concept="37vLTw" id="2U5fsQejMSK" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2U5fsQejMSH" resolve="c" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1sp" resolve="c" />
                                     </node>
                                     <node concept="3YRAZt" id="2U5fsQejMTb" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2U5fsQejMSH" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1sp" role="1bW2Oz">
                                 <property role="TrG5h" value="c" />
-                                <node concept="2jxLKc" id="2U5fsQejMSI" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1sq" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2U5fsQejMRG" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sr" role="1bW2Oz">
                       <property role="TrG5h" value="m" />
-                      <node concept="2jxLKc" id="2U5fsQejMRH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1ss" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2307,7 +2307,7 @@
                         <node concept="2OqwBi" id="2U5fsQejMTl" role="3clFbG">
                           <node concept="2OqwBi" id="2U5fsQejMTm" role="2Oq$k0">
                             <node concept="37vLTw" id="2U5fsQejMTn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2U5fsQejMT$" resolve="m" />
+                              <ref role="3cqZAo" node="2SR9xrsN1sv" resolve="m" />
                             </node>
                             <node concept="2Rf3mk" id="2U5fsQejMTo" role="2OqNvi">
                               <node concept="1xMEDy" id="2U5fsQejMTp" role="1xVPHs">
@@ -2323,24 +2323,24 @@
                                 <node concept="3clFbF" id="2U5fsQejMTu" role="3cqZAp">
                                   <node concept="2OqwBi" id="2U5fsQejMTv" role="3clFbG">
                                     <node concept="37vLTw" id="2U5fsQejMTw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2U5fsQejMTy" resolve="t" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1st" resolve="t" />
                                     </node>
                                     <node concept="3YRAZt" id="2U5fsQejMTx" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2U5fsQejMTy" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1st" role="1bW2Oz">
                                 <property role="TrG5h" value="t" />
-                                <node concept="2jxLKc" id="2U5fsQejMTz" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1su" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2U5fsQejMT$" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sv" role="1bW2Oz">
                       <property role="TrG5h" value="m" />
-                      <node concept="2jxLKc" id="2U5fsQejMT_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sw" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2376,7 +2376,7 @@
                           </node>
                           <node concept="2OqwBi" id="2U5fsQejMVy" role="33vP2m">
                             <node concept="37vLTw" id="2U5fsQejMVz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2U5fsQejMUy" resolve="m" />
+                              <ref role="3cqZAo" node="2SR9xrsN1sx" resolve="m" />
                             </node>
                             <node concept="2Rf3mk" id="2U5fsQejMV$" role="2OqNvi">
                               <node concept="1xMEDy" id="2U5fsQejMV_" role="1xVPHs">
@@ -2477,9 +2477,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2U5fsQejMUy" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sx" role="1bW2Oz">
                       <property role="TrG5h" value="m" />
-                      <node concept="2jxLKc" id="2U5fsQejMUz" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sy" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/constraints.mps
index 54528e8d53c..6cc2246f14c 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/constraints.mps
@@ -35,7 +35,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/editor.mps
index 8d2990990d0..a5d4357d55e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/editor.mps
@@ -43,7 +43,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/intentions.mps
index 62d7c265f1f..4c8b509b116 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/intentions.mps
@@ -94,6 +94,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -142,7 +143,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -162,7 +163,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
@@ -298,7 +298,7 @@
                             </node>
                             <node concept="2OqwBi" id="2U5fsQejebK" role="3uHU7B">
                               <node concept="37vLTw" id="2U5fsQejebL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2U5fsQejebN" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1s4" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2U5fsQejebM" role="2OqNvi">
                                 <ref role="3Tt5mk" to="9prt:519ky_SmIM2" resolve="module" />
@@ -307,9 +307,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2U5fsQejebN" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1s4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2U5fsQejebO" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1s5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/structure.mps
index f70d46a210a..6606b1c5bcb 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/languageModels/structure.mps
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl
index 635630c0eda..72387ad6e66 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl
@@ -41,7 +41,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -101,7 +101,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
   </dependencies>
@@ -109,7 +108,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/generator/template/com/mbeddr/cc/requirements/scenario2doc/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/generator/template/com/mbeddr/cc/requirements/scenario2doc/generator/template/main@generator.mps
index d5ff25e4a16..ecbc154190a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/generator/template/com/mbeddr/cc/requirements/scenario2doc/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/generator/template/com/mbeddr/cc/requirements/scenario2doc/generator/template/main@generator.mps
@@ -56,7 +56,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -96,7 +96,7 @@
         <property id="8903209210859212281" name="lineAtBottom" index="1tGk1y" />
         <child id="5785245534399940635" name="rows" index="C6TCM" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -129,7 +129,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596579911728" name="com.mbeddr.doc.structure.Document" flags="ng" index="1_1swa" />
@@ -183,6 +183,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -260,7 +261,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -269,7 +270,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -661,7 +661,7 @@
                                               <node concept="2OqwBi" id="7IezpGAfVAz" role="3clFbG">
                                                 <node concept="2OqwBi" id="7IezpGAfVA$" role="2Oq$k0">
                                                   <node concept="37vLTw" id="7IezpGAfVA_" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="7IezpGAfVAC" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1s$" resolve="it" />
                                                   </node>
                                                   <node concept="3TrEf2" id="7IezpGAfVAA" role="2OqNvi">
                                                     <ref role="3Tt5mk" to="4l29:4YQM_89ueET" resolve="participant" />
@@ -673,9 +673,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="7IezpGAfVAC" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN1s$" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="7IezpGAfVAD" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN1s_" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -1003,7 +1003,7 @@
                                     <node concept="2OqwBi" id="2HzhasNymSz" role="3clFbG">
                                       <node concept="2OqwBi" id="2HzhasNymS$" role="2Oq$k0">
                                         <node concept="37vLTw" id="2HzhasNymS_" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2HzhasNymSL" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1sC" resolve="it" />
                                         </node>
                                         <node concept="3Tsc0h" id="2HzhasNymSA" role="2OqNvi">
                                           <ref role="3TtcxE" to="75wo:7_tU7IQtQhQ" resolve="additionalData" />
@@ -1015,7 +1015,7 @@
                                             <node concept="3clFbF" id="2HzhasNymSE" role="3cqZAp">
                                               <node concept="2OqwBi" id="2HzhasNymSF" role="3clFbG">
                                                 <node concept="37vLTw" id="2HzhasNymSG" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2HzhasNymSJ" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1sA" resolve="it" />
                                                 </node>
                                                 <node concept="1mIQ4w" id="2HzhasNymSH" role="2OqNvi">
                                                   <node concept="chp4Y" id="2HzhasNymSI" role="cj9EA">
@@ -1025,18 +1025,18 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="2HzhasNymSJ" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN1sA" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="2HzhasNymSK" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN1sB" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2HzhasNymSL" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1sC" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="2HzhasNymSM" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1sD" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1099,7 +1099,7 @@
                               <node concept="2OqwBi" id="2HzhasNymTy" role="3clFbG">
                                 <node concept="2OqwBi" id="2HzhasNymTz" role="2Oq$k0">
                                   <node concept="37vLTw" id="2HzhasNymT$" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2HzhasNymTK" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1sG" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="2HzhasNymT_" role="2OqNvi">
                                     <ref role="3TtcxE" to="75wo:7_tU7IQtQhQ" resolve="additionalData" />
@@ -1111,7 +1111,7 @@
                                       <node concept="3clFbF" id="2HzhasNymTD" role="3cqZAp">
                                         <node concept="2OqwBi" id="2HzhasNymTE" role="3clFbG">
                                           <node concept="37vLTw" id="2HzhasNymTF" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2HzhasNymTI" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1sE" resolve="it" />
                                           </node>
                                           <node concept="1mIQ4w" id="2HzhasNymTG" role="2OqNvi">
                                             <node concept="chp4Y" id="2HzhasNymTH" role="cj9EA">
@@ -1121,18 +1121,18 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="2HzhasNymTI" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1sE" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="2HzhasNymTJ" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1sF" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2HzhasNymTK" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1sG" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2HzhasNymTL" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1sH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/languageModels/structure.mps
index 68e85d36f8c..2a9c831665a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/languageModels/structure.mps
@@ -25,7 +25,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/behavior.mps
index 2c86b7e1434..cfb99e9eaf3 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/behavior.mps
@@ -134,7 +134,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -151,7 +151,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -164,6 +164,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -230,7 +231,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -265,7 +266,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -605,7 +605,7 @@
                         <node concept="2OqwBi" id="4YQM_89vOSK" role="3clFbG">
                           <node concept="2OqwBi" id="4YQM_89vOSL" role="2Oq$k0">
                             <node concept="37vLTw" id="4YQM_89vOSN" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4YQM_89vOSS" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1sI" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="7Wto0sQ9LHL" role="2OqNvi">
                               <ref role="37wK5l" node="7Wto0sQ9vKw" resolve="returnedValue" />
@@ -619,9 +619,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4YQM_89vOSS" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sI" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4YQM_89vOST" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sJ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -633,7 +633,7 @@
                       <node concept="1PxgMI" id="5_PV_QzOTQn" role="3clFbG">
                         <node concept="2OqwBi" id="5_PV_QzOTPR" role="1m5AlR">
                           <node concept="37vLTw" id="5_PV_QzOTPy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5_PV_QzOTPv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1sK" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7Wto0sQ9FHL" role="2OqNvi">
                             <ref role="37wK5l" node="7Wto0sQ9vKw" resolve="returnedValue" />
@@ -645,9 +645,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5_PV_QzOTPv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1sK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5_PV_QzOTPw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1sL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1288,7 +1288,7 @@
                         <node concept="2OqwBi" id="5YVZL2k_Lx9" role="3clFbG">
                           <node concept="2OqwBi" id="5YVZL2k_Lxa" role="2Oq$k0">
                             <node concept="37vLTw" id="5YVZL2k_Lxb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5YVZL2k_Lxf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1sM" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5YVZL2k_Lxc" role="2OqNvi">
                               <ref role="3Tt5mk" to="4l29:5_PV_QzOmTx" resolve="returns" />
@@ -1302,9 +1302,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5YVZL2k_Lxf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sM" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5YVZL2k_Lxg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1316,7 +1316,7 @@
                       <node concept="1PxgMI" id="5YVZL2k_Lxl" role="3clFbG">
                         <node concept="2OqwBi" id="5YVZL2k_Lxm" role="1m5AlR">
                           <node concept="37vLTw" id="5YVZL2k_Lxn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5YVZL2k_Lxp" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1sO" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5YVZL2k_Lxo" role="2OqNvi">
                             <ref role="3Tt5mk" to="4l29:5_PV_QzOmTx" resolve="returns" />
@@ -1328,9 +1328,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5YVZL2k_Lxp" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1sO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5YVZL2k_Lxq" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1sP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1398,7 +1398,7 @@
                       <node concept="3clFbF" id="7Wto0sQ9vMH" role="3cqZAp">
                         <node concept="2OqwBi" id="7Wto0sQ9vMI" role="3clFbG">
                           <node concept="37vLTw" id="7Wto0sQ9vMJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Wto0sQ9vMM" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1sQ" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="7Wto0sQ9vMK" role="2OqNvi">
                             <node concept="chp4Y" id="7Wto0sQ9vML" role="cj9EA">
@@ -1408,9 +1408,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Wto0sQ9vMM" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Wto0sQ9vMN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1664,7 +1664,7 @@
                               </node>
                               <node concept="2OqwBi" id="4LqD73vEEHp" role="3uHU7w">
                                 <node concept="37vLTw" id="4LqD73vEEH4" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4LqD73vEEGd" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1sS" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4LqD73vEEHv" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1689,7 +1689,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4LqD73vEEJ4" role="3uHU7w">
                                     <node concept="37vLTw" id="4LqD73vEEIJ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4LqD73vEEGd" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1sS" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="4LqD73vEEJ9" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1707,7 +1707,7 @@
                                 <node concept="liA8E" id="7Io9oU69UGX" role="2OqNvi">
                                   <ref role="37wK5l" to="grvc:2N1CSr$DxrX" resolve="createLink" />
                                   <node concept="37vLTw" id="7Io9oU69UVH" role="37wK5m">
-                                    <ref role="3cqZAo" node="4LqD73vEEGd" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1sS" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1716,9 +1716,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4LqD73vEEGd" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4LqD73vEEGe" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1745,7 +1745,7 @@
                             <node concept="2OqwBi" id="4LqD73vEEN3" role="3clFbG">
                               <node concept="2OqwBi" id="4LqD73vEELW" role="2Oq$k0">
                                 <node concept="37vLTw" id="4LqD73vEELB" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4LqD73vEEL$" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1sU" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="4LqD73vEEM2" role="2OqNvi">
                                   <ref role="3Tt5mk" to="4l29:4YQM_89uOtI" resolve="targetParticipant" />
@@ -1757,9 +1757,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4LqD73vEEL$" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1sU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4LqD73vEEL_" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1sV" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1782,7 +1782,7 @@
                               </node>
                               <node concept="2OqwBi" id="4LqD73vEEKd" role="3uHU7w">
                                 <node concept="37vLTw" id="4LqD73vEEKe" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4LqD73vEEKu" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1sW" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4LqD73vEENb" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1807,7 +1807,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4LqD73vEEKq" role="3uHU7w">
                                     <node concept="37vLTw" id="4LqD73vEEKr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4LqD73vEEKu" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1sW" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="4LqD73vEEKs" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1825,7 +1825,7 @@
                                 <node concept="liA8E" id="7Io9oU69W7j" role="2OqNvi">
                                   <ref role="37wK5l" to="grvc:2N1CSr$DxrX" resolve="createLink" />
                                   <node concept="37vLTw" id="7Io9oU69WtU" role="37wK5m">
-                                    <ref role="3cqZAo" node="4LqD73vEEKu" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1sW" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1834,9 +1834,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4LqD73vEEKu" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4LqD73vEEKv" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1857,7 +1857,7 @@
                       <node concept="3clFbF" id="uFBNcnB$0T" role="3cqZAp">
                         <node concept="2OqwBi" id="uFBNcnB$1f" role="3clFbG">
                           <node concept="37vLTw" id="uFBNcnB$0U" role="2Oq$k0">
-                            <ref role="3cqZAo" node="uFBNcnB$0R" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1sY" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="uFBNcnB$1k" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6xkj9mMr7e" resolve="visualize" />
@@ -1871,9 +1871,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="uFBNcnB$0R" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1sY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="uFBNcnB$0S" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1sZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1975,7 +1975,7 @@
                       </node>
                       <node concept="2OqwBi" id="4YQM_89vjTR" role="3uHU7B">
                         <node concept="37vLTw" id="4YQM_89vjTy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4YQM_89vjTv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1t0" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4YQM_89vjTX" role="2OqNvi">
                           <ref role="3Tt5mk" to="4l29:4YQM_89ueET" resolve="participant" />
@@ -1984,9 +1984,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4YQM_89vjTv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1t0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4YQM_89vjTw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1t1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2047,7 +2047,7 @@
                           <node concept="2OqwBi" id="5_PV_QzOj$A" role="2Oq$k0">
                             <node concept="2OqwBi" id="5_PV_QzOj$a" role="2Oq$k0">
                               <node concept="37vLTw" id="5_PV_QzOjzP" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5_PV_QzOjzM" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1t2" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5_PV_QzOj$g" role="2OqNvi">
                                 <ref role="3Tt5mk" to="4l29:4YQM_89ueET" resolve="participant" />
@@ -2065,9 +2065,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5_PV_QzOjzM" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1t2" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5_PV_QzOjzN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1t3" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2253,7 +2253,7 @@
                       <node concept="3clFbF" id="4YQM_89wds0" role="3cqZAp">
                         <node concept="2OqwBi" id="4YQM_89wdsm" role="3clFbG">
                           <node concept="37vLTw" id="4YQM_89wds1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4YQM_89wdrY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1t4" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4YQM_89wdss" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6xkj9mMr7e" resolve="visualize" />
@@ -2267,9 +2267,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4YQM_89wdrY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1t4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4YQM_89wdrZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1t5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2383,7 +2383,7 @@
                       <node concept="3clFbF" id="4YQM_89wdqe" role="3cqZAp">
                         <node concept="2OqwBi" id="4YQM_89wdq$" role="3clFbG">
                           <node concept="37vLTw" id="4YQM_89wdqf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4YQM_89wdqc" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1t6" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4YQM_89wdqE" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6xkj9mMr7e" resolve="visualize" />
@@ -2397,9 +2397,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4YQM_89wdqc" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1t6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4YQM_89wdqd" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1t7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2455,7 +2455,7 @@
                           <node concept="3clFbF" id="4YQM_89wdnK" role="3cqZAp">
                             <node concept="2OqwBi" id="4YQM_89wdoW" role="3clFbG">
                               <node concept="37vLTw" id="4YQM_89wdoB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4YQM_89wdnI" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1t8" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="4YQM_89wdp2" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:6xkj9mMr7e" resolve="visualize" />
@@ -2469,9 +2469,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4YQM_89wdnI" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1t8" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4YQM_89wdnJ" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1t9" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3700,7 +3700,7 @@
                         <node concept="2OqwBi" id="2HzhasNy8EV" role="2Oq$k0">
                           <node concept="2OqwBi" id="2HzhasNy8EW" role="2Oq$k0">
                             <node concept="37vLTw" id="2HzhasNy8EX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8F2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1ta" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2HzhasNy8EY" role="2OqNvi">
                               <ref role="3Tt5mk" to="4l29:5DCgtXuH8qz" resolve="participant" />
@@ -3718,9 +3718,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2HzhasNy8F2" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1ta" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2HzhasNy8F3" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1tb" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3741,7 +3741,7 @@
                           </node>
                           <node concept="2OqwBi" id="2HzhasNy8Fd" role="3uHU7w">
                             <node concept="37vLTw" id="2HzhasNy8Fe" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8Fg" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1tc" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2HzhasNy8Ff" role="2OqNvi">
                               <ref role="37wK5l" node="5DCgtXuHhpE" resolve="asString" />
@@ -3752,9 +3752,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HzhasNy8Fg" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1tc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HzhasNy8Fh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1td" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3783,7 +3783,7 @@
                         <node concept="2OqwBi" id="2HzhasNy8Fv" role="2Oq$k0">
                           <node concept="2OqwBi" id="2HzhasNy8Fw" role="2Oq$k0">
                             <node concept="37vLTw" id="2HzhasNy8Fx" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8FA" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1te" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2HzhasNy8Fy" role="2OqNvi">
                               <ref role="3Tt5mk" to="4l29:5DCgtXuHdHc" resolve="participant" />
@@ -3801,9 +3801,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2HzhasNy8FA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1te" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2HzhasNy8FB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1tf" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3824,7 +3824,7 @@
                           </node>
                           <node concept="2OqwBi" id="2HzhasNy8FL" role="3uHU7w">
                             <node concept="37vLTw" id="2HzhasNy8FM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8FO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1tg" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2HzhasNy8FN" role="2OqNvi">
                               <ref role="37wK5l" node="5DCgtXuHhr9" resolve="asString" />
@@ -3835,9 +3835,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HzhasNy8FO" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1tg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HzhasNy8FP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1th" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3879,7 +3879,7 @@
                         <node concept="2OqwBi" id="2HzhasNy8G8" role="2Oq$k0">
                           <node concept="2OqwBi" id="2HzhasNy8G9" role="2Oq$k0">
                             <node concept="37vLTw" id="2HzhasNy8Ga" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8Gf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1ti" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2HzhasNy8Gb" role="2OqNvi">
                               <ref role="3Tt5mk" to="4l29:5DCgtXuH8qz" resolve="participant" />
@@ -3897,9 +3897,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2HzhasNy8Gf" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1ti" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2HzhasNy8Gg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1tj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3920,7 +3920,7 @@
                           </node>
                           <node concept="2OqwBi" id="2HzhasNy8Gq" role="3uHU7w">
                             <node concept="37vLTw" id="2HzhasNy8Gr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8GJ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1tk" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2HzhasNy8Gs" role="2OqNvi">
                               <ref role="37wK5l" node="5DCgtXuHhpE" resolve="asString" />
@@ -3945,7 +3945,7 @@
                               </node>
                               <node concept="2OqwBi" id="2HzhasNy8GF" role="3uHU7w">
                                 <node concept="37vLTw" id="2HzhasNy8GG" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2HzhasNy8GJ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1tk" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="2HzhasNy8GH" role="2OqNvi">
                                   <ref role="37wK5l" node="5DCgtXuHhpE" resolve="asString" />
@@ -3965,7 +3965,7 @@
                               <node concept="2OqwBi" id="2AZbPfO1GOR" role="37wK5m">
                                 <node concept="2OqwBi" id="2AZbPfO1BYD" role="2Oq$k0">
                                   <node concept="37vLTw" id="2AZbPfO1A_V" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2HzhasNy8GJ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1tk" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2AZbPfO1Fbm" role="2OqNvi">
                                     <ref role="3Tt5mk" to="4l29:5DCgtXuH8qz" resolve="participant" />
@@ -3982,9 +3982,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HzhasNy8GJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1tk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HzhasNy8GK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1tl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4013,7 +4013,7 @@
                         <node concept="2OqwBi" id="2HzhasNy8GY" role="2Oq$k0">
                           <node concept="2OqwBi" id="2HzhasNy8GZ" role="2Oq$k0">
                             <node concept="37vLTw" id="2HzhasNy8H0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8H5" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1tm" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2HzhasNy8H1" role="2OqNvi">
                               <ref role="3Tt5mk" to="4l29:5DCgtXuHdHc" resolve="participant" />
@@ -4031,9 +4031,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2HzhasNy8H5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1tm" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2HzhasNy8H6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1tn" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4054,7 +4054,7 @@
                           </node>
                           <node concept="2OqwBi" id="2HzhasNy8Hg" role="3uHU7w">
                             <node concept="37vLTw" id="2HzhasNy8Hh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8H_" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1to" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2HzhasNy8Hi" role="2OqNvi">
                               <ref role="37wK5l" node="5DCgtXuHhr9" resolve="asString" />
@@ -4079,7 +4079,7 @@
                               </node>
                               <node concept="2OqwBi" id="2HzhasNy8Hx" role="3uHU7w">
                                 <node concept="37vLTw" id="2HzhasNy8Hy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2HzhasNy8H_" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1to" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="2HzhasNy8Hz" role="2OqNvi">
                                   <ref role="37wK5l" node="5DCgtXuHhr9" resolve="asString" />
@@ -4099,7 +4099,7 @@
                               <node concept="2OqwBi" id="2AZbPfO1JNC" role="37wK5m">
                                 <node concept="2OqwBi" id="2AZbPfO1JND" role="2Oq$k0">
                                   <node concept="37vLTw" id="2AZbPfO1JNE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2HzhasNy8H_" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1to" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2AZbPfO1LV_" role="2OqNvi">
                                     <ref role="3Tt5mk" to="4l29:5DCgtXuHdHc" resolve="participant" />
@@ -4116,9 +4116,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HzhasNy8H_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1to" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HzhasNy8HA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1tp" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4154,7 +4154,7 @@
                           </node>
                           <node concept="2OqwBi" id="2HzhasNy8HR" role="3uHU7w">
                             <node concept="37vLTw" id="2HzhasNy8HS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNy8IU" resolve="uc" />
+                              <ref role="3cqZAo" node="2SR9xrsN1tu" resolve="uc" />
                             </node>
                             <node concept="3TrcHB" id="2HzhasNy8HT" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4179,7 +4179,7 @@
                               </node>
                               <node concept="2OqwBi" id="2HzhasNy8I4" role="3uHU7w">
                                 <node concept="37vLTw" id="2HzhasNy8I5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2HzhasNy8IU" resolve="uc" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1tu" resolve="uc" />
                                 </node>
                                 <node concept="3TrcHB" id="2HzhasNy8I6" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4197,7 +4197,7 @@
                             <node concept="liA8E" id="7Io9oU6aovh" role="2OqNvi">
                               <ref role="37wK5l" to="grvc:2N1CSr$DxrX" resolve="createLink" />
                               <node concept="37vLTw" id="7Io9oU6ap7w" role="37wK5m">
-                                <ref role="3cqZAo" node="2HzhasNy8IU" resolve="uc" />
+                                <ref role="3cqZAo" node="2SR9xrsN1tu" resolve="uc" />
                               </node>
                             </node>
                           </node>
@@ -4209,7 +4209,7 @@
                     <node concept="2OqwBi" id="2HzhasNy8I9" role="3clFbG">
                       <node concept="2OqwBi" id="2HzhasNy8Ia" role="2Oq$k0">
                         <node concept="37vLTw" id="2HzhasNy8Ib" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2HzhasNy8IU" resolve="uc" />
+                          <ref role="3cqZAo" node="2SR9xrsN1tu" resolve="uc" />
                         </node>
                         <node concept="2Rf3mk" id="2HzhasNy8Ic" role="2OqNvi">
                           <node concept="1xMEDy" id="2HzhasNy8Id" role="1xVPHs">
@@ -4232,7 +4232,7 @@
                                   <node concept="3cpWs3" id="2HzhasNy8Im" role="37wK5m">
                                     <node concept="2OqwBi" id="2HzhasNy8In" role="3uHU7w">
                                       <node concept="37vLTw" id="2HzhasNy8Io" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2HzhasNy8IU" resolve="uc" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1tu" resolve="uc" />
                                       </node>
                                       <node concept="3TrcHB" id="2HzhasNy8Ip" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4241,7 +4241,7 @@
                                     <node concept="3cpWs3" id="2HzhasNy8Iq" role="3uHU7B">
                                       <node concept="2OqwBi" id="2HzhasNy8Ir" role="3uHU7B">
                                         <node concept="37vLTw" id="2HzhasNy8Is" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2HzhasNy8Iv" resolve="aa" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1tq" resolve="aa" />
                                         </node>
                                         <node concept="2qgKlT" id="2HzhasNy8It" role="2OqNvi">
                                           <ref role="37wK5l" node="5DCgtXuHhpE" resolve="asString" />
@@ -4256,9 +4256,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2HzhasNy8Iv" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1tq" role="1bW2Oz">
                             <property role="TrG5h" value="aa" />
-                            <node concept="2jxLKc" id="2HzhasNy8Iw" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1tr" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4268,7 +4268,7 @@
                     <node concept="2OqwBi" id="2HzhasNy8Iy" role="3clFbG">
                       <node concept="2OqwBi" id="2HzhasNy8Iz" role="2Oq$k0">
                         <node concept="37vLTw" id="2HzhasNy8I$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2HzhasNy8IU" resolve="uc" />
+                          <ref role="3cqZAo" node="2SR9xrsN1tu" resolve="uc" />
                         </node>
                         <node concept="2Rf3mk" id="2HzhasNy8I_" role="2OqNvi">
                           <node concept="1xMEDy" id="2HzhasNy8IA" role="1xVPHs">
@@ -4291,7 +4291,7 @@
                                   <node concept="3cpWs3" id="2HzhasNy8IJ" role="37wK5m">
                                     <node concept="2OqwBi" id="2HzhasNy8IK" role="3uHU7w">
                                       <node concept="37vLTw" id="2HzhasNy8IL" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2HzhasNy8IS" resolve="pa" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ts" resolve="pa" />
                                       </node>
                                       <node concept="2qgKlT" id="2HzhasNy8IM" role="2OqNvi">
                                         <ref role="37wK5l" node="5DCgtXuHhr9" resolve="asString" />
@@ -4300,7 +4300,7 @@
                                     <node concept="3cpWs3" id="2HzhasNy8IN" role="3uHU7B">
                                       <node concept="2OqwBi" id="2HzhasNy8IO" role="3uHU7B">
                                         <node concept="37vLTw" id="2HzhasNy8IP" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2HzhasNy8IU" resolve="uc" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1tu" resolve="uc" />
                                         </node>
                                         <node concept="3TrcHB" id="2HzhasNy8IQ" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4315,18 +4315,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2HzhasNy8IS" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1ts" role="1bW2Oz">
                             <property role="TrG5h" value="pa" />
-                            <node concept="2jxLKc" id="2HzhasNy8IT" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1tt" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HzhasNy8IU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1tu" role="1bW2Oz">
                   <property role="TrG5h" value="uc" />
-                  <node concept="2jxLKc" id="2HzhasNy8IV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1tv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4374,7 +4374,7 @@
                             <node concept="2OqwBi" id="2HzhasNy8Jh" role="3uHU7B">
                               <node concept="2OqwBi" id="2HzhasNy8Ji" role="2Oq$k0">
                                 <node concept="37vLTw" id="2HzhasNy8Jj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2HzhasNy8Ju" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1tw" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="2HzhasNy8Jk" role="2OqNvi">
                                   <ref role="3Tt5mk" to="4l29:5DCgtXuH8qH" resolve="usecase" />
@@ -4391,7 +4391,7 @@
                           <node concept="2OqwBi" id="2HzhasNy8Jn" role="3uHU7w">
                             <node concept="2OqwBi" id="2HzhasNy8Jo" role="2Oq$k0">
                               <node concept="37vLTw" id="2HzhasNy8Jp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2HzhasNy8Ju" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1tw" resolve="it" />
                               </node>
                               <node concept="2Xjw5R" id="2HzhasNy8Jq" role="2OqNvi">
                                 <node concept="1xMEDy" id="2HzhasNy8Jr" role="1xVPHs">
@@ -4410,9 +4410,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HzhasNy8Ju" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1tw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HzhasNy8Jv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1tx" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4451,7 +4451,7 @@
                               <node concept="2OqwBi" id="2HzhasNy8JM" role="3uHU7B">
                                 <node concept="2OqwBi" id="2HzhasNy8JN" role="2Oq$k0">
                                   <node concept="37vLTw" id="2HzhasNy8JO" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2HzhasNy8JZ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ty" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2HzhasNy8JP" role="2OqNvi">
                                     <ref role="3Tt5mk" to="4l29:5DCgtXuHvpR" resolve="usecase" />
@@ -4468,7 +4468,7 @@
                             <node concept="2OqwBi" id="2HzhasNy8JS" role="3uHU7w">
                               <node concept="2OqwBi" id="2HzhasNy8JT" role="2Oq$k0">
                                 <node concept="37vLTw" id="2HzhasNy8JU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2HzhasNy8JZ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1ty" resolve="it" />
                                 </node>
                                 <node concept="2Xjw5R" id="2HzhasNy8JV" role="2OqNvi">
                                   <node concept="1xMEDy" id="2HzhasNy8JW" role="1xVPHs">
@@ -4488,9 +4488,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HzhasNy8JZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1ty" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HzhasNy8K0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1tz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4618,7 +4618,7 @@
                       <node concept="2OqwBi" id="7iNM$5cFzBZ" role="3clFbG">
                         <node concept="2OqwBi" id="7iNM$5cFzC0" role="2Oq$k0">
                           <node concept="37vLTw" id="7iNM$5cFzC1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7iNM$5cFzBH" resolve="r" />
+                            <ref role="3cqZAo" node="2SR9xrsN1tA" resolve="r" />
                           </node>
                           <node concept="3Tsc0h" id="7iNM$5cFzC2" role="2OqNvi">
                             <ref role="3TtcxE" to="75wo:7_tU7IQtQhQ" resolve="additionalData" />
@@ -4630,7 +4630,7 @@
                               <node concept="3clFbF" id="7iNM$5cFzC6" role="3cqZAp">
                                 <node concept="2OqwBi" id="7iNM$5cFzC7" role="3clFbG">
                                   <node concept="37vLTw" id="7iNM$5cFzC8" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7iNM$5cFzBI" resolve="d" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1t$" resolve="d" />
                                   </node>
                                   <node concept="1mIQ4w" id="7iNM$5cFzC9" role="2OqNvi">
                                     <node concept="chp4Y" id="7iNM$5cFzCa" role="cj9EA">
@@ -4640,18 +4640,18 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7iNM$5cFzBI" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1t$" role="1bW2Oz">
                               <property role="TrG5h" value="d" />
-                              <node concept="2jxLKc" id="7iNM$5cFzCb" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1t_" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7iNM$5cFzBH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1tA" role="1bW2Oz">
                     <property role="TrG5h" value="r" />
-                    <node concept="2jxLKc" id="7iNM$5cFzCc" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1tB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5206,12 +5206,12 @@
                               <node concept="3K4zz7" id="7MEAnCyoTr7" role="1eOMHV">
                                 <node concept="3cpWs3" id="7MEAnCyoTr8" role="3K4E3e">
                                   <node concept="3cpWs3" id="7MEAnCyoTr9" role="3uHU7B">
-                                    <node concept="Xl_RD" id="7MEAnCyoTrb" role="3uHU7B">
-                                      <property role="Xl_RC" value=":" />
-                                    </node>
                                     <node concept="Xl_RD" id="7MEAnCyoTrf" role="3uHU7w">
                                       <property role="Xl_RC" value=" " />
                                     </node>
+                                    <node concept="Xl_RD" id="7MEAnCyoTrb" role="3uHU7B">
+                                      <property role="Xl_RC" value=":" />
+                                    </node>
                                   </node>
                                   <node concept="2OqwBi" id="7Io9oU6bVDy" role="3uHU7w">
                                     <node concept="37vLTw" id="7Io9oU6bV_3" role="2Oq$k0">
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/constraints.mps
index 86f977b1be8..cef4ddba884 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/constraints.mps
@@ -72,7 +72,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -111,6 +111,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -167,7 +168,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -179,7 +180,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
     </language>
   </registry>
@@ -512,7 +512,7 @@
                       <node concept="2OqwBi" id="5CkU_dHibM5" role="3clFbG">
                         <node concept="2OqwBi" id="5CkU_dHibM6" role="2Oq$k0">
                           <node concept="37vLTw" id="5CkU_dHibM7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHibMc" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1tC" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="5CkU_dHibM8" role="2OqNvi">
                             <node concept="1xIGOp" id="5CkU_dHibM9" role="1xVPHs" />
@@ -536,9 +536,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5CkU_dHibMc" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1tC" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5CkU_dHibMd" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1tD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/editor.mps
index 44fc75c3b77..1a040b9c5f8 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/editor.mps
@@ -13,7 +13,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -30,7 +30,7 @@
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="8478191136883534207" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_Selection" flags="ng" index="upBMk">
@@ -64,10 +64,10 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -96,7 +96,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -185,7 +185,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -196,6 +196,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -244,7 +245,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -253,7 +254,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
@@ -619,7 +619,7 @@
                           <node concept="3clFbF" id="7Wto0sQ9vKp" role="3cqZAp">
                             <node concept="2OqwBi" id="7Wto0sQ9vKq" role="3clFbG">
                               <node concept="37vLTw" id="7Wto0sQ9vKr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7Wto0sQ9vKu" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1tE" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7Wto0sQ9vKs" role="2OqNvi">
                                 <node concept="chp4Y" id="7Wto0sQ9vKt" role="cj9EA">
@@ -629,9 +629,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7Wto0sQ9vKu" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7Wto0sQ9vKv" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/findUsages.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/findUsages.mps
index 37741c4f55a..b0d95b4eb97 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/findUsages.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -87,7 +87,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/intentions.mps
index 4923b33e3c5..b4ac70705be 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/intentions.mps
@@ -64,7 +64,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,7 +116,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/structure.mps
index 2fc6d2d033d..c5e7948c872 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/structure.mps
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/typesystem.mps
index 47d69e9b89f..e090f432fab 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/languageModels/typesystem.mps
@@ -71,7 +71,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -184,7 +184,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl
index b8cc0bfa820..57396f5e997 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e865cad2-7cc8-437a-951a-665bcbcb8b1a(com.mbeddr.cc.requirements)</dependency>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
@@ -23,7 +22,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -98,7 +97,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/behavior.mps
index d07d5b70648..0926c5105b1 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/behavior.mps
@@ -136,7 +136,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -152,7 +152,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -162,6 +162,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -231,7 +232,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -253,7 +254,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -754,7 +754,7 @@
                               </node>
                               <node concept="2OqwBi" id="7A_Yc2WoZmR" role="3uHU7B">
                                 <node concept="37vLTw" id="7A_Yc2WoZmS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7A_Yc2WoZmU" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1tH" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7A_Yc2WoZnY" role="2OqNvi">
                                   <ref role="3TsBF5" to="6pek:2Xp55avaVMT" resolve="scope" />
@@ -763,9 +763,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7A_Yc2WoZmU" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tH" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7A_Yc2WoZmV" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tI" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -810,7 +810,7 @@
                               </node>
                               <node concept="2OqwBi" id="7A_Yc2WoZon" role="3uHU7B">
                                 <node concept="37vLTw" id="7A_Yc2WoZoo" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7A_Yc2WoZoq" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1tJ" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7A_Yc2WoZoG" role="2OqNvi">
                                   <ref role="3TsBF5" to="6pek:2Xp55avaVMU" resolve="resonsible" />
@@ -819,9 +819,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7A_Yc2WoZoq" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tJ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7A_Yc2WoZor" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tK" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -878,7 +878,7 @@
                             <node concept="2d3UOw" id="5BlDGARhx$g" role="3clFbG">
                               <node concept="2OqwBi" id="5BlDGARhx$h" role="3uHU7B">
                                 <node concept="37vLTw" id="5BlDGARhx$i" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5BlDGARhx$1" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1tL" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5BlDGARhx$j" role="2OqNvi">
                                   <ref role="37wK5l" node="5BlDGARhtCV" resolve="prioAsNumber" />
@@ -890,9 +890,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5BlDGARhx$1" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tL" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5BlDGARhx$2" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tM" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -930,7 +930,7 @@
                           <node concept="3clFbF" id="2ka6MWOv714" role="3cqZAp">
                             <node concept="2OqwBi" id="2ka6MWOv71q" role="3clFbG">
                               <node concept="37vLTw" id="2ka6MWOv715" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2ka6MWOv712" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1tN" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="2ka6MWOv71y" role="2OqNvi">
                                 <ref role="37wK5l" node="vRfru3p0sM" resolve="isActive" />
@@ -938,9 +938,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ka6MWOv712" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tN" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ka6MWOv713" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tO" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -982,7 +982,7 @@
                           <node concept="3clFbF" id="2ka6MWOv72b" role="3cqZAp">
                             <node concept="2OqwBi" id="2ka6MWOv72c" role="3clFbG">
                               <node concept="37vLTw" id="2ka6MWOv72d" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2ka6MWOv72f" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1tP" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="2ka6MWOv72r" role="2OqNvi">
                                 <ref role="37wK5l" node="vRfru3p0tK" resolve="isDone" />
@@ -990,9 +990,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ka6MWOv72f" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tP" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ka6MWOv72g" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tQ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1034,7 +1034,7 @@
                           <node concept="3clFbF" id="2ka6MWOv72A" role="3cqZAp">
                             <node concept="2OqwBi" id="2ka6MWOv72B" role="3clFbG">
                               <node concept="37vLTw" id="2ka6MWOv72C" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2ka6MWOv72E" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1tR" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="2ka6MWOv72Q" role="2OqNvi">
                                 <ref role="37wK5l" node="vRfru3p3Gx" resolve="isOverBudget" />
@@ -1042,9 +1042,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ka6MWOv72E" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tR" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ka6MWOv72F" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tS" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1086,7 +1086,7 @@
                           <node concept="3clFbF" id="2ka6MWOv731" role="3cqZAp">
                             <node concept="2OqwBi" id="2ka6MWOv732" role="3clFbG">
                               <node concept="37vLTw" id="2ka6MWOv733" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2ka6MWOv735" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1tT" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="2ka6MWOv73h" role="2OqNvi">
                                 <ref role="37wK5l" node="2ka6MWOtHX_" resolve="hasBadTrend" />
@@ -1094,9 +1094,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ka6MWOv735" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tT" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ka6MWOv736" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1tU" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1151,7 +1151,7 @@
                     <node concept="3clFbF" id="4BCrzPIAb13" role="3cqZAp">
                       <node concept="37vLTI" id="4BCrzPIAb14" role="3clFbG">
                         <node concept="37vLTw" id="4BCrzPIAb15" role="37vLTx">
-                          <ref role="3cqZAo" node="4BCrzPIAb1b" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1tV" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="4BCrzPIAb16" role="37vLTJ">
                           <node concept="37vLTw" id="4BCrzPIAb17" role="2Oq$k0">
@@ -1169,9 +1169,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4BCrzPIAb1b" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1tV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4BCrzPIAb1c" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1tW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1363,7 +1363,7 @@
                     <node concept="d57v9" id="vRfru3oSDN" role="3clFbG">
                       <node concept="2OqwBi" id="vRfru3oSEb" role="37vLTx">
                         <node concept="37vLTw" id="vRfru3oSDQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="vRfru3oSDr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1tX" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="vRfru3oSEh" role="2OqNvi">
                           <ref role="37wK5l" node="vRfru3oQQk" resolve="amount" />
@@ -1375,9 +1375,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="vRfru3oSDr" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1tX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="vRfru3oSDs" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1tY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1676,7 +1676,7 @@
                               </node>
                               <node concept="2OqwBi" id="6QfbJ5POw0M" role="33vP2m">
                                 <node concept="37vLTw" id="6QfbJ5POw0N" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6QfbJ5POw0a" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1tZ" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="6QfbJ5POw0O" role="2OqNvi">
                                   <ref role="37wK5l" to="xvsr:7MGLj3bS6ON" resolve="firstTagForConcept" />
@@ -1736,9 +1736,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6QfbJ5POw0a" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1tZ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6QfbJ5POw0b" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1u0" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1776,7 +1776,7 @@
                           <node concept="2OqwBi" id="3greo4NFSC1" role="3fr31v">
                             <node concept="2OqwBi" id="3greo4NFSC2" role="2Oq$k0">
                               <node concept="37vLTw" id="3greo4NFSC3" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3greo4NFS_J" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1u3" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="3greo4NFSC4" role="2OqNvi">
                                 <ref role="3TtcxE" to="75wo:7_tU7IQtQhQ" resolve="additionalData" />
@@ -1790,7 +1790,7 @@
                                       <node concept="2OqwBi" id="79i$vAY7hhX" role="2Oq$k0">
                                         <node concept="2yIwOk" id="79i$vAY7hhY" role="2OqNvi" />
                                         <node concept="37vLTw" id="3greo4NFSCc" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3greo4NFSCe" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1u1" resolve="it" />
                                         </node>
                                       </node>
                                       <node concept="3O6GUB" id="79i$vAY7hhZ" role="2OqNvi">
@@ -1801,9 +1801,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3greo4NFSCe" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1u1" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3greo4NFSCf" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1u2" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1811,9 +1811,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3greo4NFS_J" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1u3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3greo4NFS_K" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1u4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1839,7 +1839,7 @@
                     <node concept="3clFbF" id="3greo4NFSD5" role="3cqZAp">
                       <node concept="37vLTI" id="3greo4NFSDU" role="3clFbG">
                         <node concept="37vLTw" id="3greo4NFSDY" role="37vLTx">
-                          <ref role="3cqZAo" node="3greo4NFSCL" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1u5" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="3greo4NFSDr" role="37vLTJ">
                           <node concept="37vLTw" id="3greo4NFSD6" role="2Oq$k0">
@@ -1857,9 +1857,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3greo4NFSCL" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1u5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3greo4NFSCM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1u6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/com.mbeddr.cc.requirements.wp.enumMigration.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/com.mbeddr.cc.requirements.wp.enumMigration.mps
index 22f7cbe6be6..81a0cd7d9dd 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/com.mbeddr.cc.requirements.wp.enumMigration.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/com.mbeddr.cc.requirements.wp.enumMigration.mps
@@ -52,7 +52,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -101,7 +101,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/constraints.mps
index ab461c7a855..024f5b0de3d 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/constraints.mps
@@ -53,7 +53,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -105,7 +105,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/editor.mps
index 3c3cac22b0a..bc33024637e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/editor.mps
@@ -82,7 +82,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -165,7 +165,7 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -180,12 +180,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -249,7 +250,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -264,7 +265,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
@@ -323,7 +323,7 @@
                               <node concept="3clFbF" id="35Mepj$OZbi" role="3cqZAp">
                                 <node concept="2OqwBi" id="35Mepj$OZbj" role="3clFbG">
                                   <node concept="37vLTw" id="35Mepj$OZbk" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="35Mepj$OZbm" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1u7" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="35Mepj$OZbl" role="2OqNvi">
                                     <ref role="3TsBF5" to="6pek:2Xp55avaVMT" resolve="scope" />
@@ -331,9 +331,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="35Mepj$OZbm" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1u7" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="35Mepj$OZbn" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1u8" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -389,7 +389,7 @@
                               <node concept="3clFbF" id="35Mepj$P1zj" role="3cqZAp">
                                 <node concept="2OqwBi" id="35Mepj$P1zk" role="3clFbG">
                                   <node concept="37vLTw" id="35Mepj$P1zl" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="35Mepj$P1zn" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1u9" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="35Mepj$P1zm" role="2OqNvi">
                                     <ref role="3TsBF5" to="6pek:2Xp55avaVMU" resolve="resonsible" />
@@ -397,9 +397,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="35Mepj$P1zn" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1u9" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="35Mepj$P1zo" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1ua" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/findUsages.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/findUsages.mps
index ab6a82a416a..b5b6e519b69 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/findUsages.mps
@@ -59,6 +59,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -86,7 +87,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -114,7 +115,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -223,7 +223,7 @@
                   <node concept="3clFbF" id="2ka6MWOyPIp" role="3cqZAp">
                     <node concept="2OqwBi" id="2ka6MWOyPIq" role="3clFbG">
                       <node concept="37vLTw" id="2ka6MWOyPIr" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2ka6MWOyPIu" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1ub" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="2ka6MWOyPIs" role="2OqNvi">
                         <node concept="chp4Y" id="2ka6MWOyPIt" role="cj9EA">
@@ -233,9 +233,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ka6MWOyPIu" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1ub" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ka6MWOyPIv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1uc" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps
index fb284f0c179..13c755113bc 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps
@@ -71,7 +71,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/typesystem.mps
index 2398ce30a52..d22eccc6249 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/typesystem.mps
@@ -29,7 +29,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -73,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl
index 45df71cffcd..0fa41e5a203 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">53bab999-e9c3-428a-80be-fef5bed08f55(com.mbeddr.cc.trace)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/generator/template/com/mbeddr/cc/requirements/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/generator/template/com/mbeddr/cc/requirements/generator/template/main@generator.mps
index 50146eb5849..beb63e6b2a9 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/generator/template/com/mbeddr/cc/requirements/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/generator/template/com/mbeddr/cc/requirements/generator/template/main@generator.mps
@@ -35,7 +35,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -82,7 +82,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/actions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/actions.mps
index c1fcccd4b33..dbf7ee23196 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/actions.mps
@@ -43,7 +43,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -54,7 +54,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -77,7 +77,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps
index f736a2a83af..bb3c1436b6e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps
@@ -72,7 +72,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -209,7 +209,7 @@
         <child id="1160998896846" name="condition" index="1gVkn0" />
         <child id="1160998916832" name="message" index="1gVpfI" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -229,7 +229,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -241,6 +241,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -356,7 +357,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -395,7 +396,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -487,7 +487,7 @@
                     <node concept="2OqwBi" id="5liZiKqPRQL" role="3clFbG">
                       <node concept="2OqwBi" id="5liZiKqPRPX" role="2Oq$k0">
                         <node concept="37vLTw" id="5liZiKqPRPC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5liZiKqPRP_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1ue" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="5liZiKqPRQ3" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -502,9 +502,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5liZiKqPRP_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1ue" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5liZiKqPRPA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1uf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -566,7 +566,7 @@
                     <node concept="3clFbF" id="7Vd878l_Wxk" role="3cqZAp">
                       <node concept="2OqwBi" id="7Vd878l_WJo" role="3clFbG">
                         <node concept="37vLTw" id="7Vd878l_Wxj" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7Vd878l_Wri" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1ug" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="7Vd878lA20Y" role="2OqNvi">
                           <ref role="3TtcxE" to="75wo:7_tU7IQtQhQ" resolve="additionalData" />
@@ -574,9 +574,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7Vd878l_Wri" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1ug" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7Vd878l_Wrj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1uh" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -587,7 +587,7 @@
                   <node concept="3clFbF" id="7Vd878lA5WF" role="3cqZAp">
                     <node concept="2OqwBi" id="7Vd878lA65M" role="3clFbG">
                       <node concept="37vLTw" id="7Vd878lA5WE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7Vd878lA5HZ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1ui" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="7Vd878lA84q" role="2OqNvi">
                         <node concept="25Kdxt" id="7Vd878lA8jm" role="cj9EA">
@@ -599,9 +599,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7Vd878lA5HZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1ui" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7Vd878lA5I0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1uj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1630,7 +1630,7 @@
                     <node concept="3cpWs3" id="3X7ZQFcraWi" role="3clFbG">
                       <node concept="2OqwBi" id="3X7ZQFcraW8" role="3uHU7w">
                         <node concept="37vLTw" id="3X7ZQFcraVN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3X7ZQFcraVl" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1uk" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3X7ZQFcraWe" role="2OqNvi">
                           <ref role="37wK5l" to="tbr6:3Q5enzfMT4l" resolve="asTextString" />
@@ -1651,9 +1651,9 @@
                   <property role="TrG5h" value="s" />
                   <node concept="17QB3L" id="3X7ZQFcraVp" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="3X7ZQFcraVl" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1uk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3X7ZQFcraVm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1ul" role="1tU5fm" />
                 </node>
               </node>
               <node concept="Xl_RD" id="3X7ZQFcraVo" role="1MDeny">
@@ -1774,7 +1774,7 @@
                     <node concept="3clFbF" id="2HzhasNxPSc" role="3cqZAp">
                       <node concept="2OqwBi" id="2HzhasNxPSy" role="3clFbG">
                         <node concept="37vLTw" id="2HzhasNxPSd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2HzhasNxPSa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1um" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="2HzhasNxPSC" role="2OqNvi">
                           <node concept="chp4Y" id="2HzhasNxPSE" role="cj9EA">
@@ -1784,9 +1784,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2HzhasNxPSa" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1um" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2HzhasNxPSb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1un" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2003,7 +2003,7 @@
                         <node concept="2OqwBi" id="2HzhasNxQae" role="3clFbG">
                           <node concept="2OqwBi" id="2HzhasNxQ9L" role="2Oq$k0">
                             <node concept="37vLTw" id="2HzhasNxQ9s" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HzhasNxQ9p" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1uo" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2HzhasNxQ9S" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2018,9 +2018,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2HzhasNxQ9p" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1uo" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2HzhasNxQ9q" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1up" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2430,7 +2430,7 @@
                         <node concept="2OqwBi" id="79i$vAY7hre" role="3uHU7B">
                           <node concept="2yIwOk" id="79i$vAY7hrf" role="2OqNvi" />
                           <node concept="37vLTw" id="1l8YAyWSrXZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1l8YAyWSrXW" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1uq" resolve="it" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="79i$vAY7hrg" role="3uHU7w">
@@ -2442,9 +2442,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1l8YAyWSrXW" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1uq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1l8YAyWSrXX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1ur" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2482,7 +2482,7 @@
                         <node concept="2OqwBi" id="79i$vAY7hrj" role="3uHU7B">
                           <node concept="2yIwOk" id="79i$vAY7hrk" role="2OqNvi" />
                           <node concept="37vLTw" id="7MGLj3bS0zS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7MGLj3bS0zU" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1us" resolve="it" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="79i$vAY7hrl" role="3uHU7w">
@@ -2494,9 +2494,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7MGLj3bS0zU" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1us" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7MGLj3bS0zV" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1ut" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2535,7 +2535,7 @@
                       <node concept="2OqwBi" id="79i$vAY7hro" role="3uHU7B">
                         <node concept="2yIwOk" id="79i$vAY7hrp" role="2OqNvi" />
                         <node concept="37vLTw" id="1l8YAyWSs0N" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1l8YAyWSs0K" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1uu" resolve="it" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="79i$vAY7hrq" role="3uHU7w">
@@ -2547,9 +2547,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1l8YAyWSs0K" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1uu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1l8YAyWSs0L" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1uv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2586,7 +2586,7 @@
                       <node concept="2OqwBi" id="79i$vAY7hrt" role="3uHU7B">
                         <node concept="2yIwOk" id="79i$vAY7hru" role="2OqNvi" />
                         <node concept="37vLTw" id="7MGLj3bS6P3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7MGLj3bS6P5" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1uw" resolve="it" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="79i$vAY7hrv" role="3uHU7w">
@@ -2598,9 +2598,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7MGLj3bS6P5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1uw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7MGLj3bS6P6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1ux" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2982,7 +2982,7 @@
                         <node concept="3clFbF" id="2WRRjDdoj$9" role="3cqZAp">
                           <node concept="2OqwBi" id="2WRRjDdoj$b" role="3clFbG">
                             <node concept="37vLTw" id="2WRRjDdoj$a" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2WRRjDdoj$7" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1uy" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="2WRRjDdoj$f" role="2OqNvi">
                               <node concept="25Kdxt" id="2WRRjDdoj$h" role="cj9EA">
@@ -2994,9 +2994,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2WRRjDdoj$7" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1uy" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2WRRjDdoj$8" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1uz" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3979,7 +3979,7 @@
                       <node concept="2OqwBi" id="79i$vAY7hqO" role="2Oq$k0">
                         <node concept="2yIwOk" id="79i$vAY7hqP" role="2OqNvi" />
                         <node concept="37vLTw" id="29X2HrD9Z37" role="2Oq$k0">
-                          <ref role="3cqZAo" node="40AYvdTOe8g" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1u$" resolve="it" />
                         </node>
                       </node>
                       <node concept="3O6GUB" id="79i$vAY7hqQ" role="2OqNvi">
@@ -4001,7 +4001,7 @@
                               </node>
                               <node concept="2OqwBi" id="40AYvdTOe9e" role="3uHU7w">
                                 <node concept="37vLTw" id="40AYvdTOe9f" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="40AYvdTOe8g" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1u$" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="40AYvdTOe9g" role="2OqNvi">
                                   <ref role="37wK5l" node="5liZiKqQ1Zb" resolve="matches" />
@@ -4017,9 +4017,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="40AYvdTOe8g" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1u$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="40AYvdTOe8h" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1u_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4104,7 +4104,7 @@
                             </node>
                             <node concept="2OqwBi" id="29X2HrDa1ks" role="3uHU7w">
                               <node concept="37vLTw" id="29X2HrDa1kt" role="2Oq$k0">
-                                <ref role="3cqZAo" node="29X2HrDa1k7" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1uA" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="29X2HrDa1ku" role="2OqNvi">
                                 <ref role="37wK5l" node="5liZiKqQ1Zb" resolve="matches" />
@@ -4122,7 +4122,7 @@
                         <node concept="2OqwBi" id="79i$vAY7hr4" role="2Oq$k0">
                           <node concept="2yIwOk" id="79i$vAY7hr5" role="2OqNvi" />
                           <node concept="37vLTw" id="29X2HrDa1kz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="29X2HrDa1k7" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1uA" resolve="it" />
                           </node>
                         </node>
                         <node concept="3O6GUB" id="79i$vAY7hr6" role="2OqNvi">
@@ -4134,9 +4134,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="29X2HrDa1k7" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1uA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="29X2HrDa1k8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1uB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4866,7 +4866,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="K292flvZsY" role="3uHU7w">
                                     <node concept="37vLTw" id="K292flvZt0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="K292flw6hV" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1uC" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="K292flvZt2" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4877,9 +4877,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="K292flw6hV" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1uC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="K292flw6hW" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1uD" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5007,7 +5007,7 @@
                               <node concept="3clFbF" id="K292flw6fS" role="3cqZAp">
                                 <node concept="2OqwBi" id="K292flw6fT" role="3clFbG">
                                   <node concept="37vLTw" id="K292flw6fU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="K292flw6fW" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1uE" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="K292flw6fV" role="2OqNvi">
                                     <ref role="3Tt5mk" to="75wo:7_tU7IQtN5I" resolve="target" />
@@ -5015,9 +5015,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="K292flw6fW" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1uE" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="K292flw6fX" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1uF" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -5062,7 +5062,7 @@
                                     <node concept="2OqwBi" id="79i$vAY7hpo" role="2Oq$k0">
                                       <node concept="2yIwOk" id="79i$vAY7hpp" role="2OqNvi" />
                                       <node concept="37vLTw" id="2AZbPfMcww7" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="K292flw6gw" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1uG" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3n3YKJ" id="79i$vAY7hpq" role="2OqNvi" />
@@ -5085,7 +5085,7 @@
                                       <node concept="2OqwBi" id="K292flw6gq" role="3uHU7w">
                                         <node concept="2OqwBi" id="K292flw6gr" role="2Oq$k0">
                                           <node concept="37vLTw" id="K292flw6gs" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="K292flw6gw" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1uG" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="K292flw6gt" role="2OqNvi">
                                             <ref role="3Tt5mk" to="75wo:7_tU7IQtN5I" resolve="target" />
@@ -5105,9 +5105,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="K292flw6gw" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1uG" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="K292flw6gx" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1uH" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5145,7 +5145,7 @@
                                   <node concept="2OqwBi" id="K292flw6gM" role="3uHU7w">
                                     <node concept="2OqwBi" id="K292flw6gN" role="2Oq$k0">
                                       <node concept="37vLTw" id="K292flw6gO" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="K292flw6gR" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1uI" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="K292flw6gP" role="2OqNvi">
                                         <ref role="3Tt5mk" to="75wo:2U5fsQek93j" resolve="req" />
@@ -5160,9 +5160,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="K292flw6gR" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1uI" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="K292flw6gS" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1uJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5198,7 +5198,7 @@
                                   <node concept="TSZUe" id="3JD5OqKP2QB" role="2OqNvi">
                                     <node concept="2OqwBi" id="3JD5OqKP2QY" role="25WWJ7">
                                       <node concept="37vLTw" id="3JD5OqKP2QD" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3JD5OqKP2Q9" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1uK" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="3JD5OqKP2R4" role="2OqNvi">
                                         <ref role="3Tt5mk" to="75wo:7_tU7IQtN5I" resolve="target" />
@@ -5208,9 +5208,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3JD5OqKP2Q9" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1uK" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3JD5OqKP2Qa" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1uL" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -5232,7 +5232,7 @@
                                   <node concept="TSZUe" id="3JD5OqKP2Re" role="2OqNvi">
                                     <node concept="2OqwBi" id="3JD5OqKP2Rf" role="25WWJ7">
                                       <node concept="37vLTw" id="3JD5OqKP2Rg" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3JD5OqKP2Ri" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1uM" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="3JD5OqKP2Rm" role="2OqNvi">
                                         <ref role="3Tt5mk" to="75wo:2U5fsQek93j" resolve="req" />
@@ -5242,9 +5242,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3JD5OqKP2Ri" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1uM" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3JD5OqKP2Rj" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1uN" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -5509,7 +5509,7 @@
                               <node concept="3Tqbb2" id="5ajiCS7a7kx" role="10QFUM" />
                               <node concept="2OqwBi" id="5ajiCS7a7ky" role="10QFUP">
                                 <node concept="37vLTw" id="5ajiCS7a7kz" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5ajiCS7a7js" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1uO" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="5ajiCS7a7k$" role="2OqNvi">
                                   <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -5525,9 +5525,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5ajiCS7a7js" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1uO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5ajiCS7a7kB" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1uP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5540,7 +5540,7 @@
                         <node concept="10QFUN" id="5ajiCS7a7kH" role="1eOMHV">
                           <node concept="2OqwBi" id="5ajiCS7a7kI" role="10QFUP">
                             <node concept="37vLTw" id="5ajiCS7a7kJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5ajiCS7a7jt" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1uQ" resolve="it" />
                             </node>
                             <node concept="liA8E" id="5ajiCS7a7kK" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -5553,9 +5553,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5ajiCS7a7jt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1uQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5ajiCS7a7kM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1uR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5585,7 +5585,7 @@
                               <node concept="3Tqbb2" id="5ajiCS7a7l0" role="10QFUM" />
                               <node concept="2OqwBi" id="5ajiCS7a7l1" role="10QFUP">
                                 <node concept="37vLTw" id="5ajiCS7a7l2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5ajiCS7a7ju" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1uS" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="5ajiCS7a7l3" role="2OqNvi">
                                   <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -5601,9 +5601,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5ajiCS7a7ju" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1uS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5ajiCS7a7l6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1uT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5616,7 +5616,7 @@
                         <node concept="10QFUN" id="5ajiCS7a7lc" role="1eOMHV">
                           <node concept="2OqwBi" id="5ajiCS7a7ld" role="10QFUP">
                             <node concept="37vLTw" id="5ajiCS7a7le" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5ajiCS7a7jv" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1uU" resolve="it" />
                             </node>
                             <node concept="liA8E" id="5ajiCS7a7lf" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -5629,9 +5629,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5ajiCS7a7jv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1uU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5ajiCS7a7lh" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1uV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5671,7 +5671,7 @@
                       <node concept="3clFbF" id="5ajiCS7a7lx" role="3cqZAp">
                         <node concept="2OqwBi" id="5ajiCS7a7ly" role="3clFbG">
                           <node concept="37vLTw" id="5ajiCS7a7lz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5ajiCS7a7jy" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1uW" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="5ajiCS7a7l$" role="2OqNvi">
                             <node concept="1xMEDy" id="5ajiCS7a7l_" role="1xVPHs">
@@ -5683,9 +5683,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5ajiCS7a7jy" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1uW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5ajiCS7a7lB" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1uX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5706,7 +5706,7 @@
                       <node concept="3clFbF" id="5ajiCS7a7lK" role="3cqZAp">
                         <node concept="2OqwBi" id="5ajiCS7a7lL" role="3clFbG">
                           <node concept="37vLTw" id="5ajiCS7a7lM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5ajiCS7a7jz" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1uY" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="5ajiCS7a7lN" role="2OqNvi">
                             <node concept="1xMEDy" id="5ajiCS7a7lO" role="1xVPHs">
@@ -5718,9 +5718,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5ajiCS7a7jz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1uY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5ajiCS7a7lQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1uZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5743,7 +5743,7 @@
                     <node concept="1rXfSq" id="2AZbPfMaMRm" role="3clFbG">
                       <ref role="37wK5l" node="5MZGKPTh29F" resolve="createClass" />
                       <node concept="37vLTw" id="5ajiCS7a7m0" role="37wK5m">
-                        <ref role="3cqZAo" node="5ajiCS7a7j_" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1v0" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="K292flvRqi" role="37wK5m">
                         <ref role="3cqZAo" node="K292flvRqf" resolve="color" />
@@ -5754,9 +5754,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ajiCS7a7j_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1v0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ajiCS7a7m3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1v1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5783,7 +5783,7 @@
                             <node concept="2OqwBi" id="5ajiCS7acsJ" role="3uHU7B">
                               <node concept="2OqwBi" id="5ajiCS7a7nn" role="2Oq$k0">
                                 <node concept="37vLTw" id="5ajiCS7a7mZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5ajiCS7a7mI" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1v2" resolve="it" />
                                 </node>
                                 <node concept="2Xjw5R" id="5ajiCS7acsm" role="2OqNvi">
                                   <node concept="1xMEDy" id="5ajiCS7acsn" role="1xVPHs">
@@ -5814,9 +5814,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ajiCS7a7mI" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1v2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ajiCS7a7mJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1v3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5842,7 +5842,7 @@
                             <node concept="2OqwBi" id="79i$vAY7hps" role="2Oq$k0">
                               <node concept="2yIwOk" id="79i$vAY7hpt" role="2OqNvi" />
                               <node concept="37vLTw" id="2AZbPfMcwd3" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5ajiCS7a7op" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1v4" resolve="it" />
                               </node>
                             </node>
                             <node concept="3n3YKJ" id="79i$vAY7hpu" role="2OqNvi" />
@@ -5856,7 +5856,7 @@
                                 <node concept="2OqwBi" id="5ajiCS7acsY" role="3uHU7B">
                                   <node concept="2OqwBi" id="5ajiCS7acsZ" role="2Oq$k0">
                                     <node concept="37vLTw" id="5ajiCS7act0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5ajiCS7a7op" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1v4" resolve="it" />
                                     </node>
                                     <node concept="2Xjw5R" id="5ajiCS7act1" role="2OqNvi">
                                       <node concept="1xMEDy" id="5ajiCS7act2" role="1xVPHs">
@@ -5889,9 +5889,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ajiCS7a7op" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1v4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ajiCS7a7oq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1v5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6019,7 +6019,7 @@
                       <node concept="3clFbF" id="5ajiCS7a7i6" role="3cqZAp">
                         <node concept="2OqwBi" id="5ajiCS7a7i7" role="3clFbG">
                           <node concept="37vLTw" id="5ajiCS7a7i8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5ajiCS7a7hn" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1v6" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5ajiCS7a7i9" role="2OqNvi">
                             <ref role="3Tt5mk" to="75wo:7_tU7IQtN5I" resolve="target" />
@@ -6027,9 +6027,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5ajiCS7a7hn" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1v6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5ajiCS7a7ia" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1v7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6066,7 +6066,7 @@
                     <node concept="1rXfSq" id="2AZbPfMaMPO" role="3clFbG">
                       <ref role="37wK5l" node="5MZGKPTh29F" resolve="createClass" />
                       <node concept="37vLTw" id="5ajiCS7a7iq" role="37wK5m">
-                        <ref role="3cqZAo" node="5ajiCS7a7hp" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1v8" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="K292flvRqb" role="37wK5m">
                         <ref role="3cqZAo" node="K292flvRq6" resolve="color" />
@@ -6077,9 +6077,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ajiCS7a7hp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1v8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ajiCS7a7it" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1v9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6106,7 +6106,7 @@
                             <node concept="2OqwBi" id="79i$vAY7hpw" role="2Oq$k0">
                               <node concept="2yIwOk" id="79i$vAY7hpx" role="2OqNvi" />
                               <node concept="37vLTw" id="2AZbPfMcw8r" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5ajiCS7a7hq" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1va" resolve="it" />
                               </node>
                             </node>
                             <node concept="3n3YKJ" id="79i$vAY7hpy" role="2OqNvi" />
@@ -6129,7 +6129,7 @@
                               <node concept="2OqwBi" id="5ajiCS7a7iO" role="3uHU7w">
                                 <node concept="2OqwBi" id="5ajiCS7a7iP" role="2Oq$k0">
                                   <node concept="37vLTw" id="5ajiCS7a7iQ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5ajiCS7a7hq" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1va" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5ajiCS7a7iR" role="2OqNvi">
                                     <ref role="3Tt5mk" to="75wo:7_tU7IQtN5I" resolve="target" />
@@ -6149,9 +6149,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ajiCS7a7hq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1va" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ajiCS7a7iU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vb" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6189,7 +6189,7 @@
                           <node concept="2OqwBi" id="5ajiCS7a7jb" role="3uHU7w">
                             <node concept="2OqwBi" id="5ajiCS7a7jc" role="2Oq$k0">
                               <node concept="37vLTw" id="5ajiCS7a7jd" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5ajiCS7a7hr" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1vc" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5ajiCS7a7je" role="2OqNvi">
                                 <ref role="3Tt5mk" to="75wo:2U5fsQek93j" resolve="req" />
@@ -6204,9 +6204,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ajiCS7a7hr" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ajiCS7a7jg" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6364,7 +6364,7 @@
                       <node concept="3fqX7Q" id="2AZbPfOuyTl" role="3clFbG">
                         <node concept="2OqwBi" id="2AZbPfOuyTn" role="3fr31v">
                           <node concept="37vLTw" id="2AZbPfOuyTo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2AZbPfOuxf$" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1ve" resolve="it" />
                           </node>
                           <node concept="liA8E" id="2AZbPfOuyTp" role="2OqNvi">
                             <ref role="37wK5l" to="lui2:~SModule.isPackaged()" resolve="isPackaged" />
@@ -6373,9 +6373,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2AZbPfOuxf$" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1ve" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2AZbPfOuxf_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1vf" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6435,7 +6435,7 @@
                         <node concept="2OqwBi" id="2AZbPfOJ_K7" role="33vP2m">
                           <node concept="2JrnkZ" id="2AZbPfOJ_K8" role="2Oq$k0">
                             <node concept="37vLTw" id="2AZbPfOJ_K9" role="2JrQYb">
-                              <ref role="3cqZAo" node="2AZbPfOHYAu" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1vg" resolve="it" />
                             </node>
                           </node>
                           <node concept="liA8E" id="2AZbPfOJ_Ka" role="2OqNvi">
@@ -6455,9 +6455,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2AZbPfOHYAu" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1vg" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2AZbPfOHYAv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1vh" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7067,7 +7067,7 @@
                   <node concept="3clFbF" id="K292flwTjD" role="3cqZAp">
                     <node concept="2OqwBi" id="K292flwTjZ" role="3clFbG">
                       <node concept="37vLTw" id="K292flwTjE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="K292flwTjB" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1vi" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="K292flwTk5" role="2OqNvi">
                         <ref role="37wK5l" node="7_tU7IQttUA" resolve="requirementsInModule" />
@@ -7075,9 +7075,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="K292flwTjB" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vi" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="K292flwTjC" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7355,7 +7355,7 @@
                               <node concept="2OqwBi" id="26F1Swi4X6O" role="37vLTx">
                                 <node concept="2OqwBi" id="26F1Swi4X6P" role="2Oq$k0">
                                   <node concept="37vLTw" id="26F1Swi4X6Q" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7sHl0myf3N6" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1vk" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="26F1Swi4X6R" role="2OqNvi">
                                     <ref role="3TsBF5" to="75wo:3WZzKB5aRqh" resolve="user" />
@@ -7393,7 +7393,7 @@
                             <ref role="1Pybhc" to="wyt6:~Long" resolve="Long" />
                             <node concept="2OqwBi" id="26F1Swi4X7i" role="37wK5m">
                               <node concept="37vLTw" id="26F1Swi4X7j" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7sHl0myf3N6" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1vk" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="26F1Swi4X7k" role="2OqNvi">
                                 <ref role="3TsBF5" to="75wo:3WZzKB5aRqi" resolve="timestamp" />
@@ -7462,9 +7462,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7sHl0myf3N6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1vk" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7sHl0myf3N7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1vl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7490,7 +7490,7 @@
                     <node concept="3clFbF" id="7sHl0myf3Qx" role="3cqZAp">
                       <node concept="37vLTI" id="7sHl0myf3Rt" role="3clFbG">
                         <node concept="37vLTw" id="7sHl0myf3Rw" role="37vLTx">
-                          <ref role="3cqZAo" node="7sHl0myf3Qv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1vm" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="7sHl0myf3R1" role="37vLTJ">
                           <node concept="37vLTw" id="7sHl0myf3QG" role="2Oq$k0">
@@ -7506,7 +7506,7 @@
                       <node concept="37vLTI" id="26F1Swi4X6e" role="3clFbG">
                         <node concept="2OqwBi" id="26F1Swi4X6A" role="37vLTx">
                           <node concept="37vLTw" id="26F1Swi4X6h" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7sHl0myf3Qv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1vm" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="26F1Swi4X6G" role="2OqNvi">
                             <node concept="1xMEDy" id="26F1Swi4X6H" role="1xVPHs">
@@ -7532,9 +7532,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7sHl0myf3Qv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1vm" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7sHl0myf3Qw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1vn" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8021,7 +8021,7 @@
                                   <node concept="10QFUN" id="26F1Swi8TGF" role="1eOMHV">
                                     <node concept="2OqwBi" id="26F1Swi8TGG" role="10QFUP">
                                       <node concept="37vLTw" id="26F1Swi8TGH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="26F1Swi8TGM" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1vo" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="26F1Swi8TGI" role="2OqNvi">
                                         <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -8040,9 +8040,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="26F1Swi8TGM" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1vo" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="26F1Swi8TGN" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1vp" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -8056,7 +8056,7 @@
                               <node concept="10QFUN" id="26F1Swi8TGT" role="1eOMHV">
                                 <node concept="2OqwBi" id="26F1Swi8TGU" role="10QFUP">
                                   <node concept="37vLTw" id="26F1Swi8TGV" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="26F1Swi8TGY" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1vq" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="26F1Swi8TGW" role="2OqNvi">
                                     <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -8069,9 +8069,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="26F1Swi8TGY" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1vq" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="26F1Swi8TGZ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1vr" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8213,7 +8213,7 @@
                             <node concept="2yIwOk" id="79i$vAY7hqo" role="2OqNvi" />
                             <node concept="2OqwBi" id="TFjNjjyAP0" role="2Oq$k0">
                               <node concept="37vLTw" id="TFjNjjyAOF" role="2Oq$k0">
-                                <ref role="3cqZAo" node="TFjNjjyAO1" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1vs" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="TFjNjjyPNh" role="2OqNvi">
                                 <ref role="3Tt5mk" to="75wo:KXQGmKJGP7" resolve="status" />
@@ -8232,9 +8232,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="TFjNjjyAO1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1vs" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="TFjNjjyAO2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1vt" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8262,7 +8262,7 @@
                         <node concept="1PxgMI" id="TFjNjjyASt" role="37vLTx">
                           <node concept="2OqwBi" id="TFjNjjyARS" role="1m5AlR">
                             <node concept="37vLTw" id="TFjNjjyAOe" role="2Oq$k0">
-                              <ref role="3cqZAo" node="TFjNjjyAOu" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1vu" resolve="it" />
                             </node>
                             <node concept="1mfA1w" id="TFjNjjyAS1" role="2OqNvi" />
                           </node>
@@ -8286,9 +8286,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="TFjNjjyAOu" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1vu" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="TFjNjjyAOv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1vv" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8934,7 +8934,7 @@
                                   <node concept="10QFUN" id="4U_WvDhXSQZ" role="1eOMHV">
                                     <node concept="2OqwBi" id="4U_WvDhXSR0" role="10QFUP">
                                       <node concept="37vLTw" id="4U_WvDhXSR1" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4U_WvDhXSR7" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1vw" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="4U_WvDhXSR2" role="2OqNvi">
                                         <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -8953,9 +8953,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4U_WvDhXSR7" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1vw" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4U_WvDhXSR8" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1vx" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -8969,7 +8969,7 @@
                               <node concept="10QFUN" id="4U_WvDhXSRf" role="1eOMHV">
                                 <node concept="2OqwBi" id="4U_WvDhXSRg" role="10QFUP">
                                   <node concept="37vLTw" id="4U_WvDhXSRh" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4U_WvDhXSRl" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1vy" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="4U_WvDhXSRi" role="2OqNvi">
                                     <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -8982,9 +8982,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4U_WvDhXSRl" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1vy" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4U_WvDhXSRm" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1vz" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/com.mbeddr.cc.requirements.enumMigration.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/com.mbeddr.cc.requirements.enumMigration.mps
index c35e567b3f9..282dcda6503 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/com.mbeddr.cc.requirements.enumMigration.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/com.mbeddr.cc.requirements.enumMigration.mps
@@ -52,7 +52,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -101,7 +101,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/constraints.mps
index 338a7680698..12981771f6f 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/constraints.mps
@@ -81,7 +81,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -121,6 +121,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -170,7 +171,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -178,7 +179,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -219,15 +219,15 @@
                           <node concept="2qgKlT" id="5CkU_dHican" role="2OqNvi">
                             <ref role="37wK5l" to="xvsr:veUazBMZRY" resolve="canTargetRequirement" />
                             <node concept="37vLTw" id="5CkU_dHicao" role="37wK5m">
-                              <ref role="3cqZAo" node="5CkU_dHicap" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1v$" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHicap" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1v$" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHicaq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1v_" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/editor.mps
index 1382ee6a3c4..0f498feeb14 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/editor.mps
@@ -34,7 +34,7 @@
       <concept id="1402906326896143883" name="jetbrains.mps.lang.editor.structure.CellKeyMap_FunctionParm_selectedNode" flags="nn" index="0GJ7k" />
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -65,7 +65,7 @@
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="8478191136883534207" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_Selection" flags="ng" index="upBMk">
@@ -120,10 +120,10 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -159,7 +159,7 @@
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -183,7 +183,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -325,7 +325,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -347,7 +347,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -376,6 +376,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -484,7 +485,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -499,7 +500,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -2185,7 +2185,7 @@
                                     <node concept="2OqwBi" id="79i$vAY7hrM" role="2Oq$k0">
                                       <node concept="2yIwOk" id="79i$vAY7hrN" role="2OqNvi" />
                                       <node concept="37vLTw" id="4Gm$o7XDhpA" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4Gm$o7XDhpF" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1vA" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="79i$vAY7hrO" role="2OqNvi">
@@ -2202,9 +2202,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Gm$o7XDhpF" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1vA" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4Gm$o7XDhpG" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1vB" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2719,7 +2719,7 @@
                                 <node concept="2OqwBi" id="79i$vAY7hrQ" role="2Oq$k0">
                                   <node concept="2yIwOk" id="79i$vAY7hrR" role="2OqNvi" />
                                   <node concept="37vLTw" id="4Gm$o7XDhrO" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4Gm$o7XDhrT" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1vC" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="79i$vAY7hrS" role="2OqNvi">
@@ -2736,9 +2736,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4Gm$o7XDhrT" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1vC" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4Gm$o7XDhrU" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1vD" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3824,7 +3824,7 @@
                                 <node concept="1PxgMI" id="KXQGmKIXF0" role="2Oq$k0">
                                   <node concept="2OqwBi" id="KXQGmKIXEy" role="1m5AlR">
                                     <node concept="37vLTw" id="KXQGmKIXEd" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="KXQGmKIXE7" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1vE" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="KXQGmKIXEE" role="2OqNvi">
                                       <ref role="37wK5l" to="xvsr:7MGLj3bS6ON" resolve="firstTagForConcept" />
@@ -3848,9 +3848,9 @@
                           <property role="TrG5h" value="s" />
                           <node concept="10Oyi0" id="KXQGmKIXEb" role="1tU5fm" />
                         </node>
-                        <node concept="Rh6nW" id="KXQGmKIXE7" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1vE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="KXQGmKIXE8" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1vF" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="3cmrfG" id="KXQGmKIXEa" role="1MDeny">
@@ -4052,7 +4052,7 @@
                             <node concept="3clFbF" id="35Mepj$QSQS" role="3cqZAp">
                               <node concept="2OqwBi" id="35Mepj$QSQT" role="3clFbG">
                                 <node concept="37vLTw" id="35Mepj$QSQU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="35Mepj$QSQW" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1vG" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="35Mepj$QSQV" role="2OqNvi">
                                   <ref role="3TsBF5" to="75wo:2PGidvqi7$D" resolve="tag" />
@@ -4060,9 +4060,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="35Mepj$QSQW" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1vG" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="35Mepj$QSQX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1vH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/findUsages.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/findUsages.mps
index aee4e413bff..a2c57a76834 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/findUsages.mps
@@ -67,6 +67,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -102,7 +103,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -130,7 +131,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -229,7 +229,7 @@
                   <node concept="3clFbF" id="3Y7ywckGlNL" role="3cqZAp">
                     <node concept="2OqwBi" id="3Y7ywckGlNM" role="3clFbG">
                       <node concept="37vLTw" id="3Y7ywckGlNN" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3Y7ywckGlNJ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1vI" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="3Y7ywckGlNO" role="2OqNvi">
                         <node concept="chp4Y" id="3Y7ywckGlNP" role="cj9EA">
@@ -239,9 +239,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3Y7ywckGlNJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vI" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3Y7ywckGlNK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vJ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -318,7 +318,7 @@
                   <node concept="3clFbF" id="10GsATRFcye" role="3cqZAp">
                     <node concept="2OqwBi" id="10GsATRFcym" role="3clFbG">
                       <node concept="37vLTw" id="10GsATRFcyn" role="2Oq$k0">
-                        <ref role="3cqZAo" node="10GsATRFcyq" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1vK" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="10GsATRFcyo" role="2OqNvi">
                         <node concept="chp4Y" id="10GsATRFcyM" role="cj9EA">
@@ -328,9 +328,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="10GsATRFcyq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="10GsATRFcyr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vL" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps
index 1e60e03fa98..6db9a2bda30 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps
@@ -51,7 +51,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -140,7 +140,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -156,7 +156,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -172,6 +172,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -300,7 +301,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -313,7 +314,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -414,7 +414,7 @@
                   <node concept="3clFbF" id="9t0esqapWR" role="3cqZAp">
                     <node concept="2OqwBi" id="9t0esqapVK" role="3clFbG">
                       <node concept="37vLTw" id="9t0esqapWS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="9t0esqapWP" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1vM" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="9t0esqapVM" role="2OqNvi">
                         <ref role="37wK5l" to="xvsr:3RseghIds7l" resolve="foldCloseChildren" />
@@ -426,9 +426,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="9t0esqapWP" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="9t0esqapWQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1300,7 +1300,7 @@
                         <node concept="2OqwBi" id="3ZdGyCQN78k" role="3clFbG">
                           <node concept="2OqwBi" id="3ZdGyCQN4hu" role="2Oq$k0">
                             <node concept="37vLTw" id="3ZdGyCQN4aH" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ZdGyCQMPyi" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1vO" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="3ZdGyCQN5rX" role="2OqNvi">
                               <ref role="3TtcxE" to="75wo:7MGLj3bRsTQ" resolve="additionalTags" />
@@ -1317,7 +1317,7 @@
                     <node concept="3fqX7Q" id="3ZdGyCQMPHd" role="3clFbw">
                       <node concept="2OqwBi" id="3ZdGyCQMPWr" role="3fr31v">
                         <node concept="37vLTw" id="3ZdGyCQMPOX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3ZdGyCQMPyi" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1vO" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3ZdGyCQMR3K" role="2OqNvi">
                           <ref role="37wK5l" to="xvsr:7MGLj3bS0zB" resolve="hasTag" />
@@ -1329,9 +1329,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3ZdGyCQMPyi" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3ZdGyCQMPyj" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vP" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1441,15 +1441,15 @@
                       </node>
                       <node concept="TSZUe" id="64BVCtJ2KVo" role="2OqNvi">
                         <node concept="37vLTw" id="64BVCtJ2Lc2" role="25WWJ7">
-                          <ref role="3cqZAo" node="64BVCtJ2Bek" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1vQ" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="64BVCtJ2Bek" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="64BVCtJ2Bel" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vR" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1495,7 +1495,7 @@
                     <node concept="3clFbF" id="64BVCtJ2y6i" role="3cqZAp">
                       <node concept="2OqwBi" id="64BVCtJ2y6j" role="3clFbG">
                         <node concept="37vLTw" id="64BVCtJ2y6k" role="2Oq$k0">
-                          <ref role="3cqZAo" node="64BVCtJ2y6n" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1vS" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="64BVCtJ2y6l" role="2OqNvi">
                           <node concept="chp4Y" id="64BVCtJ2y6m" role="cj9EA">
@@ -1505,9 +1505,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="64BVCtJ2y6n" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1vS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="64BVCtJ2y6o" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1vT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1525,15 +1525,15 @@
                           <node concept="3clFbF" id="64BVCtJ2jih" role="3cqZAp">
                             <node concept="2OqwBi" id="64BVCtJ2jsP" role="3clFbG">
                               <node concept="37vLTw" id="64BVCtJ2jig" role="2Oq$k0">
-                                <ref role="3cqZAo" node="64BVCtJ2j8f" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1vU" resolve="it" />
                               </node>
                               <node concept="1mfA1w" id="64BVCtJ2jJ$" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="64BVCtJ2j8f" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1vU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="64BVCtJ2j8g" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1vV" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2032,7 +2032,7 @@
                   <node concept="3clFbF" id="1$2iQp397Mr" role="3cqZAp">
                     <node concept="2OqwBi" id="1$2iQp397Ms" role="3clFbG">
                       <node concept="37vLTw" id="1$2iQp397Mt" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1$2iQp397Mw" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1vW" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="1$2iQp397Mu" role="2OqNvi">
                         <node concept="chp4Y" id="1$2iQp397Mv" role="cj9EA">
@@ -2042,9 +2042,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1$2iQp397Mw" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1vW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1$2iQp397Mx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1vX" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/listeners.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/listeners.mps
index 35d549799a6..9524a18419a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/listeners.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/listeners.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -72,7 +72,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -80,7 +80,7 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -99,6 +99,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -126,7 +127,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -177,7 +178,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -354,7 +354,7 @@
                                           <node concept="3clFbF" id="4vVfYP3y4gG" role="3cqZAp">
                                             <node concept="2OqwBi" id="4vVfYP3y4kg" role="3clFbG">
                                               <node concept="37vLTw" id="4vVfYP3y4gF" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4vVfYP3m0v9" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1vY" resolve="it" />
                                               </node>
                                               <node concept="3YRAZt" id="4vVfYP3y4$u" role="2OqNvi" />
                                             </node>
@@ -367,7 +367,7 @@
                                           <node concept="3JPx81" id="4vVfYP3m4a1" role="2OqNvi">
                                             <node concept="2OqwBi" id="4vVfYP3m4f8" role="25WWJ7">
                                               <node concept="37vLTw" id="4vVfYP3m4c0" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4vVfYP3m0v9" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1vY" resolve="it" />
                                               </node>
                                               <node concept="2yIwOk" id="3cUcim$bOry" role="2OqNvi" />
                                             </node>
@@ -375,9 +375,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4vVfYP3m0v9" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1vY" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4vVfYP3m0va" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1vZ" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/refactorings.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/refactorings.mps
index ebd32e22756..2cd6315f372 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/refactorings.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/refactorings.mps
@@ -66,7 +66,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps
index 9b57422318f..3a96130d588 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps
@@ -89,7 +89,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/typesystem.mps
index 79599aa5f50..ca9aed086c7 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:6d955fa4-5e1f-4ac1-9307-613a95ee3b74(com.mbeddr.cc.requirements.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
@@ -78,7 +78,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,6 +90,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -231,7 +232,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -252,7 +253,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -365,7 +365,7 @@
                       <node concept="3clFbF" id="5DCgtXuHUST" role="3cqZAp">
                         <node concept="2OqwBi" id="5DCgtXuHUTb" role="3clFbG">
                           <node concept="37vLTw" id="5DCgtXuHUSU" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5DCgtXuHUSR" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1w0" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5DCgtXuHUTh" role="2OqNvi">
                             <node concept="25Kdxt" id="5DCgtXuHUTj" role="cj9EA">
@@ -377,9 +377,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5DCgtXuHUSR" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1w0" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5DCgtXuHUSS" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1w1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -700,7 +700,7 @@
                         <node concept="3fqX7Q" id="KXQGmKJc1k" role="3clFbG">
                           <node concept="2OqwBi" id="KXQGmKJc1D" role="3fr31v">
                             <node concept="37vLTw" id="KXQGmKJc1m" role="2Oq$k0">
-                              <ref role="3cqZAo" node="KXQGmKJc1h" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1w2" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="KXQGmKJc1J" role="2OqNvi">
                               <ref role="37wK5l" to="xvsr:7MGLj3bS0zB" resolve="hasTag" />
@@ -712,9 +712,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="KXQGmKJc1h" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1w2" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="KXQGmKJc1i" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1w3" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -730,13 +730,13 @@
                         <ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
                       </node>
                       <node concept="37vLTw" id="KXQGmKJc2i" role="1urrMF">
-                        <ref role="3cqZAo" node="KXQGmKJc2c" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1w4" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="KXQGmKJc2c" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1w4" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="KXQGmKJc2d" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1w5" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -792,7 +792,7 @@
                           <node concept="2OqwBi" id="79i$vAY7hqs" role="3uHU7B">
                             <node concept="2yIwOk" id="79i$vAY7hqt" role="2OqNvi" />
                             <node concept="37vLTw" id="KXQGmKJxYS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="KXQGmKJxYP" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1w6" resolve="it" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="79i$vAY7hqu" role="3uHU7w">
@@ -804,9 +804,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="KXQGmKJxYP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1w6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="KXQGmKJxYQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1w7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -819,13 +819,13 @@
                         <property role="Xl_RC" value="only one of these allowed in each requirement" />
                       </node>
                       <node concept="37vLTw" id="KXQGmKJy1o" role="1urrMF">
-                        <ref role="3cqZAo" node="KXQGmKJy0P" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1w8" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="KXQGmKJy0P" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1w8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="KXQGmKJy0Q" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1w9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl
index 36a8130a096..c06431b8748 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl
@@ -28,7 +28,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -84,7 +84,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -112,7 +111,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -190,7 +189,6 @@
     <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" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps
index 3029d4a691c..e8b8769a634 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps
@@ -5,7 +5,7 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -37,6 +37,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -62,7 +63,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -71,7 +72,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -120,7 +121,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -129,7 +130,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -137,7 +138,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -175,7 +176,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -564,6 +565,7 @@
   <node concept="sE7Ow" id="7PQduOXsbmi">
     <property role="TrG5h" value="UndentRequirement" />
     <property role="2uzpH1" value="Undent" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="7PQduOXse8M" role="1NuT2Z">
       <property role="TrG5h" value="req" />
       <node concept="3Tm6S6" id="7PQduOXse8N" role="1B3o_S" />
@@ -636,6 +638,7 @@
   <node concept="sE7Ow" id="7PQduOXsUhj">
     <property role="TrG5h" value="IndentRequirement" />
     <property role="2uzpH1" value="Undent" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="7PQduOXsUhk" role="1NuT2Z">
       <property role="TrG5h" value="req" />
       <node concept="3Tm6S6" id="7PQduOXsUhl" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd
index 63d0a671a70..45fbbc38fb1 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.requirements.pluginSolution" uuid="a1854b36-e32a-4cc9-a787-23cd7b91fc26" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.cc.requirements.pluginSolution" uuid="a1854b36-e32a-4cc9-a787-23cd7b91fc26" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -40,7 +39,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/generator/template/main@generator.mps
index 57a628109e8..06a1fe85a98 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/generator/template/main@generator.mps
@@ -54,7 +54,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,7 +124,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/behavior.mps
index b758c603a0f..bf62057167b 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/behavior.mps
@@ -99,7 +99,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -110,7 +110,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -135,7 +135,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/constraints.mps
index a4b68efb19d..6754baa8130 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/constraints.mps
@@ -43,7 +43,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -96,7 +96,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/editor.mps
index ab3f859574f..0d45b5798e2 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/editor.mps
@@ -102,7 +102,7 @@
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -128,7 +128,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -209,7 +209,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -270,7 +270,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/intentions.mps
index 6390721f3a3..5e3801db500 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/intentions.mps
@@ -82,7 +82,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -155,7 +155,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/refactorings.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/refactorings.mps
index a4cac73822d..9eb25e157cf 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/refactorings.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/refactorings.mps
@@ -89,7 +89,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/structure.mps
index dc8121d4e90..ffbe53c663e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/structure.mps
@@ -50,7 +50,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/typesystem.mps
index 7b87dff3282..bab51472157 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/languageModels/typesystem.mps
@@ -43,7 +43,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -104,7 +104,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/models/com/mbeddr/cc/trace/pluginSolution/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/models/com/mbeddr/cc/trace/pluginSolution/plugin.mps
index 26082ae2c06..5ca002dbd79 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/models/com/mbeddr/cc/trace/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/models/com/mbeddr/cc/trace/pluginSolution/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
   </languages>
   <imports>
     <import index="5zzw" ref="r:95e79a09-2c9b-4b4c-9713-9635ede32e0c(com.mbeddr.cc.trace.refactorings)" />
@@ -23,7 +23,7 @@
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 066f89fce1c..cb9078ad9ac 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.trace.pluginSolution" uuid="3d5afcea-4e96-4041-a45b-783ce6295a76" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.cc.trace.pluginSolution" uuid="3d5afcea-4e96-4041-a45b-783ce6295a76" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">53bab999-e9c3-428a-80be-fef5bed08f55(com.mbeddr.cc.trace)</dependency>
     <dependency reexport="false">9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)</dependency>
@@ -21,7 +20,7 @@
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
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 4bbf7856778..04054792a6f 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
@@ -37,7 +37,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -106,7 +106,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -120,7 +119,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl
index b38a5a7b870..c0cf28b7a89 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl
@@ -50,7 +50,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -150,7 +150,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -177,7 +176,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -191,7 +190,7 @@
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -260,7 +259,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>e401b447-8019-4ccd-a72c-bfb0230f5782(com.mbeddr.cc.var.fm)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/com/mbeddr/cc/var/annotations/generator/main/util.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/com/mbeddr/cc/var/annotations/generator/main/util.mps
index f905313f7f1..d71330d16e9 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/com/mbeddr/cc/var/annotations/generator/main/util.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/com/mbeddr/cc/var/annotations/generator/main/util.mps
@@ -96,7 +96,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -109,7 +109,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -123,6 +123,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -205,7 +206,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -242,7 +243,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
@@ -483,7 +483,7 @@
                                         <node concept="2OqwBi" id="3$f8hf_ttKI" role="3clFbG">
                                           <node concept="2OqwBi" id="3$f8hf_mQsa" role="2Oq$k0">
                                             <node concept="37vLTw" id="3$f8hf_mQsb" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3$f8hf_lSCw" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1xE" resolve="it" />
                                             </node>
                                             <node concept="3Tsc0h" id="3$f8hf_mQsc" role="2OqNvi">
                                               <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -499,7 +499,7 @@
                                                     </node>
                                                     <node concept="2OqwBi" id="3$f8hf_t_jE" role="3uHU7B">
                                                       <node concept="37vLTw" id="3$f8hf_t_jF" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="3$f8hf_txf8" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN1x$" resolve="it" />
                                                       </node>
                                                       <node concept="3TrEf2" id="3$f8hf_t_jG" role="2OqNvi">
                                                         <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -508,9 +508,9 @@
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="Rh6nW" id="3$f8hf_txf8" role="1bW2Oz">
+                                              <node concept="gl6BB" id="2SR9xrsN1x$" role="1bW2Oz">
                                                 <property role="TrG5h" value="it" />
-                                                <node concept="2jxLKc" id="3$f8hf_txf9" role="1tU5fm" />
+                                                <node concept="2jxLKc" id="2SR9xrsN1x_" role="1tU5fm" />
                                               </node>
                                             </node>
                                           </node>
@@ -532,7 +532,7 @@
                                               <node concept="2OqwBi" id="3$f8hf_mFYI" role="2Oq$k0">
                                                 <node concept="2OqwBi" id="3$f8hf_mFYJ" role="2Oq$k0">
                                                   <node concept="37vLTw" id="3$f8hf_mFYK" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="3$f8hf_lSCw" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1xE" resolve="it" />
                                                   </node>
                                                   <node concept="3Tsc0h" id="3$f8hf_mFYL" role="2OqNvi">
                                                     <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -561,12 +561,12 @@
                                                             </node>
                                                           </node>
                                                           <node concept="37vLTw" id="3$f8hf_skjJ" role="3uHU7B">
-                                                            <ref role="3cqZAo" node="3$f8hf_mFYU" resolve="it" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN1xA" resolve="it" />
                                                           </node>
                                                         </node>
                                                         <node concept="17QLQc" id="3$f8hf_skjK" role="3uHU7w">
                                                           <node concept="37vLTw" id="3$f8hf_skjL" role="3uHU7B">
-                                                            <ref role="3cqZAo" node="3$f8hf_mFYU" resolve="it" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN1xA" resolve="it" />
                                                           </node>
                                                           <node concept="Jnkvi" id="3$f8hf_skjM" role="3uHU7w">
                                                             <ref role="1M0zk5" node="3$f8hf_mtMc" resolve="module" />
@@ -575,9 +575,9 @@
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="Rh6nW" id="3$f8hf_mFYU" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="2SR9xrsN1xA" role="1bW2Oz">
                                                     <property role="TrG5h" value="it" />
-                                                    <node concept="2jxLKc" id="3$f8hf_mFYV" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="2SR9xrsN1xB" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -602,7 +602,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="3$f8hf_mFZ5" role="3uHU7B">
                                                     <node concept="37vLTw" id="3$f8hf_mFZ6" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="3$f8hf_mFZ8" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN1xC" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="3$f8hf_mFZ7" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="vs0r:DubiFAXDKB" resolve="chunk" />
@@ -611,9 +611,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="3$f8hf_mFZ8" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN1xC" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="3$f8hf_mFZ9" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN1xD" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -621,9 +621,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3$f8hf_lSCw" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1xE" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3$f8hf_lSCx" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1xF" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -784,7 +784,7 @@
                                   <node concept="2OqwBi" id="7iyfbqsmh$z" role="3clFbG">
                                     <node concept="2OqwBi" id="7iyfbqsmh$$" role="2Oq$k0">
                                       <node concept="37vLTw" id="7iyfbqsmh$_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7iyfbqsmh$Q" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1xI" resolve="it" />
                                       </node>
                                       <node concept="2Rf3mk" id="7iyfbqsmh$A" role="2OqNvi">
                                         <node concept="1xMEDy" id="7iyfbqsmh$B" role="1xVPHs">
@@ -809,7 +809,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="7iyfbqsml01" role="3uHU7B">
                                                 <node concept="37vLTw" id="7iyfbqsml02" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="7iyfbqsml04" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1xG" resolve="it" />
                                                 </node>
                                                 <node concept="2qgKlT" id="7iyfbqsml03" role="2OqNvi">
                                                   <ref role="37wK5l" to="hwgx:7jSUHHvkAph" resolve="referencedModuleContent" />
@@ -818,18 +818,18 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="7iyfbqsml04" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN1xG" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="7iyfbqsml05" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN1xH" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7iyfbqsmh$Q" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1xI" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7iyfbqsmh$R" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1xJ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -840,7 +840,7 @@
                               <node concept="3clFbF" id="7iyfbqsmmud" role="3cqZAp">
                                 <node concept="2OqwBi" id="7iyfbqsmmSt" role="3clFbG">
                                   <node concept="37vLTw" id="7iyfbqsmmuc" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7iyfbqs65F2" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1xK" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="7iyfbqsmoDl" role="2OqNvi">
                                     <ref role="37wK5l" to="hwgx:7jSUHHvkApb" resolve="rebindToProxy" />
@@ -849,9 +849,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7iyfbqs65F2" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1xK" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7iyfbqs65F3" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1xL" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1335,7 +1335,7 @@
                           <node concept="2OqwBi" id="3biQRBA41nQ" role="3clFbG">
                             <node concept="2OqwBi" id="3biQRBA41nR" role="2Oq$k0">
                               <node concept="37vLTw" id="3biQRBA41nS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3biQRBA41nW" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1xM" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3biQRBA41nT" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qdv7:1wLq5fNouH8" resolve="condition" />
@@ -1350,9 +1350,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3biQRBA41nW" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1xM" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3biQRBA41nX" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1xN" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1641,7 +1641,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6xlxoSXc0eQ" role="3uHU7B">
                                   <node concept="37vLTw" id="6xlxoSXc0eR" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6xlxoSXc0eT" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1xO" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6xlxoSXc0eS" role="2OqNvi">
                                     <ref role="3Tt5mk" to="qqyh:5USXI9Kzba7" resolve="attribute" />
@@ -1650,9 +1650,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6xlxoSXc0eT" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1xO" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6xlxoSXc0eU" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1xP" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/main@generator.mps
index 6b6393e671c..e25d233706e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/generator/template/main@generator.mps
@@ -2,7 +2,7 @@
 <model ref="r:62d92012-8061-40a9-9f5f-893e60f8aedd(com.mbeddr.cc.var.annotations.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
@@ -100,6 +100,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -162,7 +163,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -239,7 +239,7 @@
                       <node concept="3clFbF" id="4ha9sSdQLby" role="3cqZAp">
                         <node concept="2OqwBi" id="4ha9sSdQLbz" role="3clFbG">
                           <node concept="37vLTw" id="4ha9sSdQLb$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ha9sSdQLbB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1xQ" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4ha9sSdQLb_" role="2OqNvi">
                             <node concept="chp4Y" id="4ha9sSdQLbA" role="cj9EA">
@@ -249,9 +249,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4ha9sSdQLbB" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1xQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4ha9sSdQLbC" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1xR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -279,7 +279,7 @@
                         <node concept="3cpWs3" id="4omMoHU$VDy" role="2k5Stb">
                           <node concept="2OqwBi" id="4omMoHU$W62" role="3uHU7w">
                             <node concept="37vLTw" id="4omMoHU$VSu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4omMoHU$N5Z" resolve="mm" />
+                              <ref role="3cqZAo" node="2SR9xrsN1xS" resolve="mm" />
                             </node>
                             <node concept="2qgKlT" id="4omMoHU$X9P" role="2OqNvi">
                               <ref role="37wK5l" to="hwgx:4JF77iuPCMH" resolve="qualifiedName" />
@@ -296,9 +296,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4omMoHU$N5Z" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1xS" role="1bW2Oz">
                   <property role="TrG5h" value="mm" />
-                  <node concept="2jxLKc" id="4omMoHU$N60" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1xT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -484,7 +484,7 @@
                       <node concept="2OqwBi" id="7oNb1MJZLnU" role="3clFbG">
                         <node concept="2OqwBi" id="7oNb1MJZL3M" role="2Oq$k0">
                           <node concept="37vLTw" id="7oNb1MJZL3N" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7oNb1MJZL3Q" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1xU" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="7oNb1MJZL3O" role="2OqNvi">
                             <node concept="3CFYIy" id="7oNb1MJZL3P" role="3CFYIz">
@@ -496,9 +496,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7oNb1MJZL3Q" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1xU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7oNb1MJZL3R" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1xV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -510,7 +510,7 @@
                     <node concept="2OqwBi" id="7oNb1MK0UAU" role="3clFbG">
                       <node concept="2OqwBi" id="7oNb1MK0T9U" role="2Oq$k0">
                         <node concept="37vLTw" id="7oNb1MK0SOZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7oNb1MJZMEC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1xW" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="7oNb1MK0U0y" role="2OqNvi">
                           <node concept="3CFYIy" id="7oNb1MK0Ufm" role="3CFYIz">
@@ -522,9 +522,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7oNb1MJZMEC" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1xW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7oNb1MJZMED" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1xX" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/behavior.mps
index ff1b391e621..8b781d72c8d 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/behavior.mps
@@ -149,7 +149,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -167,7 +167,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -193,6 +193,7 @@
       <concept id="374287044672146034" name="com.mbeddr.mpsutil.blutil.structure.CastedCandidateExpr" flags="ng" index="20xRpB" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -272,7 +273,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -310,7 +311,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1189,7 +1189,7 @@
                     <node concept="3clFbC" id="6hM2_xVMMRm" role="3clFbG">
                       <node concept="2OqwBi" id="6hM2_xVMMRn" role="3uHU7B">
                         <node concept="37vLTw" id="6hM2_xVMMRo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hM2_xVMMRr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1wc" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6hM2_xVMMRp" role="2OqNvi">
                           <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -1201,9 +1201,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6hM2_xVMMRr" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1wc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6hM2_xVMMRs" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1wd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1391,7 +1391,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="10hF$bGPMH" role="3uHU7B">
                                         <node concept="37vLTw" id="10hF$bGPJP" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="10hF$bGPH1" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1we" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="10hF$bGPXM" role="2OqNvi">
                                           <ref role="3Tt5mk" to="qdv7:10hF$bDHpP" resolve="featureModel" />
@@ -1400,9 +1400,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="10hF$bGPH1" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1we" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="10hF$bGPH2" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1wf" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1476,7 +1476,7 @@
                       </node>
                       <node concept="2OqwBi" id="10hF$bGJfW" role="3uHU7B">
                         <node concept="37vLTw" id="10hF$bGJcx" role="2Oq$k0">
-                          <ref role="3cqZAo" node="10hF$bGJ9_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1wg" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="10hF$bGJrA" role="2OqNvi">
                           <ref role="3Tt5mk" to="qdv7:10hF$bDHpP" resolve="featureModel" />
@@ -1485,9 +1485,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="10hF$bGJ9_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1wg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="10hF$bGJ9A" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1wh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1767,7 +1767,7 @@
                         </node>
                         <node concept="2OqwBi" id="6hM2_xVNlZP" role="3uHU7B">
                           <node concept="37vLTw" id="6hM2_xVNlZQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hM2_xVNlZS" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1wi" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6hM2_xVNlZR" role="2OqNvi">
                             <ref role="3Tt5mk" to="qqyh:5USXI9Kzba7" resolve="attribute" />
@@ -1776,9 +1776,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hM2_xVNlZS" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1wi" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hM2_xVNlZT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1wj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2339,7 +2339,7 @@
                     <node concept="2OqwBi" id="3yKJMlzsmVI" role="3clFbG">
                       <node concept="2OqwBi" id="3yKJMlzskLl" role="2Oq$k0">
                         <node concept="37vLTw" id="3yKJMlzskB8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3yKJMlzskyz" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1wk" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="3yKJMlzslTY" role="2OqNvi">
                           <ref role="3TtcxE" to="qqyh:5USXI9KzkZL" resolve="contents" />
@@ -2353,9 +2353,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3yKJMlzskyz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1wk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3yKJMlzsky$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1wl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2438,7 +2438,7 @@
                           <node concept="2OqwBi" id="1qn9LsHS1bz" role="3clFbG">
                             <node concept="2OqwBi" id="1qn9LsHS1b$" role="2Oq$k0">
                               <node concept="37vLTw" id="1qn9LsHS1b_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1qn9LsHS1bD" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1wm" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="1qn9LsHS1bA" role="2OqNvi">
                                 <ref role="3TtcxE" to="qqyh:5USXI9KzkZL" resolve="contents" />
@@ -2452,9 +2452,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1qn9LsHS1bD" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1wm" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1qn9LsHS1bE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1wn" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2483,7 +2483,7 @@
                           <node concept="2OqwBi" id="1qn9LsHREE5" role="3clFbG">
                             <node concept="2OqwBi" id="1qn9LsHREE6" role="2Oq$k0">
                               <node concept="37vLTw" id="1qn9LsHREE7" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1qn9LsHREEb" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1wo" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="1qn9LsHRVPU" role="2OqNvi">
                                 <ref role="3TtcxE" to="qqyh:5USXI9KzkZL" resolve="contents" />
@@ -2497,9 +2497,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1qn9LsHREEb" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1wo" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1qn9LsHREEc" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1wp" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2531,7 +2531,7 @@
                     <node concept="2OqwBi" id="3yKJMlzsshl" role="3clFbG">
                       <node concept="2OqwBi" id="3yKJMlzsshm" role="2Oq$k0">
                         <node concept="37vLTw" id="3yKJMlzsshn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3yKJMlzsshr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1wq" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="3yKJMlzssho" role="2OqNvi">
                           <ref role="3TtcxE" to="qqyh:5USXI9KzkZL" resolve="contents" />
@@ -2545,9 +2545,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3yKJMlzsshr" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1wq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3yKJMlzsshs" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1wr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2668,7 +2668,7 @@
                                   <node concept="2OqwBi" id="4Z2KgTfD8MD" role="2Oq$k0">
                                     <node concept="2OqwBi" id="1B8w38pRV7L" role="2Oq$k0">
                                       <node concept="37vLTw" id="1B8w38pRV3b" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4omMoHU$CIS" resolve="m" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ws" resolve="m" />
                                       </node>
                                       <node concept="3TrEf2" id="1B8w38pRVxX" role="2OqNvi">
                                         <ref role="3Tt5mk" to="qdv7:5JmNU9PAaLi" resolve="featureModel" />
@@ -2682,7 +2682,7 @@
                                     <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                     <node concept="2OqwBi" id="4Z2KgTfDcFo" role="37wK5m">
                                       <node concept="37vLTw" id="4Z2KgTfDcsI" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4omMoHU$xSS" resolve="fm" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1wu" resolve="fm" />
                                       </node>
                                       <node concept="2qgKlT" id="4Z2KgTfDd_2" role="2OqNvi">
                                         <ref role="37wK5l" to="hwgx:4JF77iuPCMH" resolve="qualifiedName" />
@@ -2692,9 +2692,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4omMoHU$CIS" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1ws" role="1bW2Oz">
                               <property role="TrG5h" value="m" />
-                              <node concept="2jxLKc" id="4omMoHU$CIT" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1wt" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2702,9 +2702,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4omMoHU$xSS" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1wu" role="1bW2Oz">
                   <property role="TrG5h" value="fm" />
-                  <node concept="2jxLKc" id="4omMoHU$xST" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1wv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2744,7 +2744,7 @@
                       <node concept="3clFbF" id="5DBke2vwmTD" role="3cqZAp">
                         <node concept="2OqwBi" id="5DBke2vwmTE" role="3clFbG">
                           <node concept="37vLTw" id="5DBke2vwmTF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5DBke2vwmTI" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1ww" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5DBke2vwmTG" role="2OqNvi">
                             <node concept="chp4Y" id="5DBke2vwmTH" role="cj9EA">
@@ -2754,9 +2754,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5DBke2vwmTI" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1ww" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5DBke2vwmTJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1wx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2812,7 +2812,7 @@
                         <node concept="2OqwBi" id="5DBke2vwmU9" role="3clFbG">
                           <node concept="2OqwBi" id="5DBke2vwmUa" role="2Oq$k0">
                             <node concept="37vLTw" id="5DBke2vwmUb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5DBke2vwmUe" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1wy" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5DBke2vwmUc" role="2OqNvi">
                               <ref role="3Tt5mk" to="qdv7:5JmNU9PAaLi" resolve="featureModel" />
@@ -2822,9 +2822,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5DBke2vwmUe" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1wy" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5DBke2vwmUf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1wz" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2841,7 +2841,7 @@
                           <node concept="2OqwBi" id="5DBke2vwmUn" role="3clFbG">
                             <node concept="2OqwBi" id="5DBke2vwmUo" role="2Oq$k0">
                               <node concept="37vLTw" id="5DBke2vwmUp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5DBke2vwmUs" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1w$" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5DBke2vwmUq" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qdv7:5JmNU9PAaLj" resolve="configurationModel" />
@@ -2851,9 +2851,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5DBke2vwmUs" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1w$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5DBke2vwmUt" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1w_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2961,7 +2961,7 @@
                         </node>
                         <node concept="2OqwBi" id="4ha9sSdKWE2" role="3uHU7B">
                           <node concept="37vLTw" id="4ha9sSdKWE3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ha9sSdKWE5" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1wA" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4ha9sSdKWE4" role="2OqNvi">
                             <ref role="3Tt5mk" to="qdv7:5JmNU9PAaLi" resolve="featureModel" />
@@ -2970,9 +2970,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4ha9sSdKWE5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1wA" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4ha9sSdKWE6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1wB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3027,7 +3027,7 @@
                         <node concept="3clFbC" id="4ha9sSdKWEv" role="3clFbG">
                           <node concept="2OqwBi" id="4ha9sSdKWEw" role="3uHU7B">
                             <node concept="37vLTw" id="4ha9sSdKWEx" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4ha9sSdKWE$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1wC" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4ha9sSdKWEy" role="2OqNvi">
                               <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -3039,9 +3039,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4ha9sSdKWE$" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1wC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4ha9sSdKWE_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1wD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3160,7 +3160,7 @@
                     <node concept="3clFbC" id="1HBb4ql6EVV" role="3clFbG">
                       <node concept="2OqwBi" id="1HBb4ql6EVW" role="3uHU7B">
                         <node concept="37vLTw" id="1HBb4ql6EVX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1HBb4ql6EW0" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1wE" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="1HBb4ql6EVY" role="2OqNvi">
                           <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -3172,9 +3172,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1HBb4ql6EW0" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1wE" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1HBb4ql6EW1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1wF" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/constraints.mps
index 931edc95f51..4ce282ddd85 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/constraints.mps
@@ -76,7 +76,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -111,6 +111,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -182,7 +183,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -220,7 +221,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -364,7 +364,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5CkU_dHictH" role="3uHU7B">
                                   <node concept="37vLTw" id="5CkU_dHictI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5CkU_dHictK" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1wG" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5CkU_dHictJ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaa" resolve="configures" />
@@ -374,9 +374,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHictK" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1wG" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHictL" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1wH" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -439,7 +439,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5CkU_dHicx9" role="3uHU7B">
                                     <node concept="37vLTw" id="5CkU_dHicxa" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5CkU_dHicxc" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1wI" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5CkU_dHicxb" role="2OqNvi">
                                       <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaa" resolve="configures" />
@@ -449,9 +449,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5CkU_dHicxc" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1wI" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5CkU_dHicxd" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1wJ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -577,7 +577,7 @@
                               </node>
                               <node concept="2OqwBi" id="5CkU_dHicCq" role="3uHU7B">
                                 <node concept="37vLTw" id="5CkU_dHicCr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHicCt" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1wK" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5CkU_dHicCs" role="2OqNvi">
                                   <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaa" resolve="configures" />
@@ -586,9 +586,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHicCt" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1wK" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHicCu" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1wL" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -723,7 +723,7 @@
                       <node concept="3clFbF" id="5CkU_dHicED" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHicEE" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHicEF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHicEH" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1wM" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5CkU_dHicEG" role="2OqNvi">
                             <ref role="3Tt5mk" to="qqyh:6Ce4x7KSUoM" resolve="feature" />
@@ -731,9 +731,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHicEH" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1wM" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHicEI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1wN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -749,7 +749,7 @@
                         <node concept="X8dFx" id="5CkU_dHicEP" role="2OqNvi">
                           <node concept="2OqwBi" id="5CkU_dHicEQ" role="25WWJ7">
                             <node concept="37vLTw" id="5CkU_dHicER" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHicET" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1wO" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5CkU_dHicES" role="2OqNvi">
                               <ref role="37wK5l" to="g0zr:6Ce4x7LmZjI" resolve="attributes" />
@@ -759,9 +759,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5CkU_dHicET" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1wO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5CkU_dHicEU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1wP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -819,7 +819,7 @@
                           <node concept="2OqwBi" id="5CkU_dHicFc" role="3clFbG">
                             <node concept="2OqwBi" id="5CkU_dHicFd" role="2Oq$k0">
                               <node concept="37vLTw" id="5CkU_dHicFe" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHicFj" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1wQ" resolve="it" />
                               </node>
                               <node concept="3CFZ6_" id="5CkU_dHicFf" role="2OqNvi">
                                 <node concept="3CFYIy" id="5CkU_dHicFg" role="3CFYIz">
@@ -835,9 +835,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHicFj" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1wQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHicFk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1wR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -849,7 +849,7 @@
                         <node concept="1PxgMI" id="5CkU_dHicFp" role="3clFbG">
                           <node concept="2OqwBi" id="5CkU_dHicFq" role="1m5AlR">
                             <node concept="37vLTw" id="5CkU_dHicFr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHicFv" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1wS" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="5CkU_dHicFs" role="2OqNvi">
                               <node concept="3CFYIy" id="5CkU_dHicFt" role="3CFYIz">
@@ -863,9 +863,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHicFv" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1wS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHicFw" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1wT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -901,7 +901,7 @@
                           <node concept="3clFbF" id="5CkU_dHicFK" role="3cqZAp">
                             <node concept="2OqwBi" id="5CkU_dHicFL" role="3clFbG">
                               <node concept="37vLTw" id="5CkU_dHicFM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHicFO" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1wU" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5CkU_dHicFN" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qqyh:6Ce4x7KSUoM" resolve="feature" />
@@ -909,9 +909,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHicFO" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1wU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHicFP" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1wV" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -927,7 +927,7 @@
                             <node concept="X8dFx" id="5CkU_dHicFW" role="2OqNvi">
                               <node concept="2OqwBi" id="5CkU_dHicFX" role="25WWJ7">
                                 <node concept="37vLTw" id="5CkU_dHicFY" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHicG0" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1wW" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5CkU_dHicFZ" role="2OqNvi">
                                   <ref role="37wK5l" to="g0zr:6Ce4x7LmZjI" resolve="attributes" />
@@ -937,9 +937,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHicG0" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1wW" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHicG1" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1wX" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1000,7 +1000,7 @@
                             <node concept="10Nm6u" id="5CkU_dHicGk" role="3uHU7w" />
                             <node concept="2OqwBi" id="5CkU_dHicGl" role="3uHU7B">
                               <node concept="37vLTw" id="5CkU_dHicGm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHicGp" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1wY" resolve="it" />
                               </node>
                               <node concept="3CFZ6_" id="5CkU_dHicGn" role="2OqNvi">
                                 <node concept="3CFYIy" id="5CkU_dHicGo" role="3CFYIz">
@@ -1011,9 +1011,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHicGp" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1wY" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHicGq" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1wZ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1024,7 +1024,7 @@
                       <node concept="3clFbF" id="5CkU_dHicGu" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHicGv" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHicGw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHicGz" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1x0" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="5CkU_dHicGx" role="2OqNvi">
                             <node concept="3CFYIy" id="5CkU_dHicGy" role="3CFYIz">
@@ -1034,9 +1034,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHicGz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1x0" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHicG$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1x1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1072,7 +1072,7 @@
                           <node concept="3clFbF" id="5CkU_dHicGO" role="3cqZAp">
                             <node concept="2OqwBi" id="5CkU_dHicGP" role="3clFbG">
                               <node concept="37vLTw" id="5CkU_dHicGQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHicGS" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1x2" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5CkU_dHicGR" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qqyh:6Ce4x7KSUoM" resolve="feature" />
@@ -1080,9 +1080,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHicGS" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1x2" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHicGT" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1x3" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1098,7 +1098,7 @@
                             <node concept="X8dFx" id="5CkU_dHicH0" role="2OqNvi">
                               <node concept="2OqwBi" id="5CkU_dHicH1" role="25WWJ7">
                                 <node concept="37vLTw" id="5CkU_dHicH2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHicH4" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1x4" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5CkU_dHicH3" role="2OqNvi">
                                   <ref role="37wK5l" to="g0zr:6Ce4x7LmZjI" resolve="attributes" />
@@ -1108,9 +1108,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHicH4" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1x4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHicH5" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1x5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1186,7 +1186,7 @@
                             <node concept="2OqwBi" id="5CkU_dHicHr" role="3clFbG">
                               <node concept="2OqwBi" id="5CkU_dHicHs" role="2Oq$k0">
                                 <node concept="37vLTw" id="5CkU_dHicHt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHicHE" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1x8" resolve="it" />
                                 </node>
                                 <node concept="2Rf3mk" id="5CkU_dHicHu" role="2OqNvi">
                                   <node concept="1xMEDy" id="5CkU_dHicHv" role="1xVPHs">
@@ -1202,7 +1202,7 @@
                                     <node concept="3clFbF" id="5CkU_dHicH$" role="3cqZAp">
                                       <node concept="2OqwBi" id="5CkU_dHicH_" role="3clFbG">
                                         <node concept="37vLTw" id="5CkU_dHicHA" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5CkU_dHicHC" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1x6" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="5CkU_dHicHB" role="2OqNvi">
                                           <ref role="37wK5l" to="g0zr:1qn9LsHSJIE" resolve="isAlwaysPresent" />
@@ -1210,18 +1210,18 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5CkU_dHicHC" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1x6" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5CkU_dHicHD" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1x7" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHicHE" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1x8" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHicHF" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1x9" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1232,7 +1232,7 @@
                         <node concept="3clFbF" id="5CkU_dHicHJ" role="3cqZAp">
                           <node concept="2OqwBi" id="5CkU_dHicHK" role="3clFbG">
                             <node concept="37vLTw" id="5CkU_dHicHL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHicHN" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1xa" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="5CkU_dHicHM" role="2OqNvi">
                               <ref role="3TtcxE" to="qqyh:5USXI9Kzbal" resolve="attributes" />
@@ -1240,9 +1240,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHicHN" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1xa" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHicHO" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1xb" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1319,7 +1319,7 @@
                           <node concept="2OqwBi" id="5CkU_dHid8O" role="3clFbG">
                             <node concept="2OqwBi" id="5CkU_dHid8P" role="2Oq$k0">
                               <node concept="37vLTw" id="5CkU_dHid8Q" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHid8U" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1xc" resolve="it" />
                               </node>
                               <node concept="3CFZ6_" id="5CkU_dHid8R" role="2OqNvi">
                                 <node concept="3CFYIy" id="5CkU_dHid8S" role="3CFYIz">
@@ -1331,9 +1331,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHid8U" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1xc" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHid8V" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1xd" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1344,7 +1344,7 @@
                       <node concept="3clFbF" id="5CkU_dHid8Z" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHid90" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHid91" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHid99" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1xe" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5CkU_dHid92" role="2OqNvi">
                             <node concept="25Kdxt" id="5CkU_dHid93" role="cj9EA">
@@ -1360,9 +1360,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHid99" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1xe" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHid9a" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1xf" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1519,7 +1519,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5CkU_dHicYg" role="3uHU7B">
                                   <node concept="37vLTw" id="5CkU_dHicYh" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5CkU_dHicYj" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1xg" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5CkU_dHicYi" role="2OqNvi">
                                     <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaa" resolve="configures" />
@@ -1529,9 +1529,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHicYj" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1xg" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHicYk" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1xh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1597,7 +1597,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5CkU_dHid1G" role="3uHU7B">
                                     <node concept="37vLTw" id="5CkU_dHid1H" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5CkU_dHid1J" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1xi" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5CkU_dHid1I" role="2OqNvi">
                                       <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaa" resolve="configures" />
@@ -1607,9 +1607,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5CkU_dHid1J" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1xi" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5CkU_dHid1K" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1xj" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/editor.mps
index b898a1abdc8..cb93c1c6376 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/editor.mps
@@ -31,7 +31,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -95,7 +95,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -121,7 +121,7 @@
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -157,7 +157,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -296,7 +296,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -314,7 +314,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="7024111702304495340" name="jetbrains.mps.baseLanguage.structure.MulAssignmentExpression" flags="nn" index="3vZbUc" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -322,6 +322,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -398,7 +399,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -418,7 +419,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -1907,7 +1907,7 @@
                               </node>
                               <node concept="2OqwBi" id="3Yyx8Gug6ee" role="3uHU7B">
                                 <node concept="37vLTw" id="3Yyx8Gug6ef" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3Yyx8Gug6eh" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1xk" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3Yyx8Gug6eg" role="2OqNvi">
                                   <ref role="3Tt5mk" to="qqyh:5USXI9Kzba7" resolve="attribute" />
@@ -1916,9 +1916,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3Yyx8Gug6eh" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1xk" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3Yyx8Gug6ei" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1xl" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2537,7 +2537,7 @@
                           <node concept="2OqwBi" id="3SIytSCD1_7" role="3clFbG">
                             <node concept="2OqwBi" id="3SIytSCD1_8" role="2Oq$k0">
                               <node concept="37vLTw" id="3SIytSCD1_9" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3SIytSCD1_c" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1xm" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3SIytSCD1_a" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qdv7:1wLq5fNouH8" resolve="condition" />
@@ -2549,9 +2549,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3SIytSCD1_c" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1xm" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3SIytSCD1_d" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1xn" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2590,7 +2590,7 @@
                               <node concept="2OqwBi" id="3SIytSCCYpQ" role="3clFbG">
                                 <node concept="2OqwBi" id="3SIytSCCYpR" role="2Oq$k0">
                                   <node concept="37vLTw" id="3SIytSCCYpS" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3SIytSCCYpV" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1xo" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="3SIytSCCYpT" role="2OqNvi">
                                     <ref role="3Tt5mk" to="qdv7:1wLq5fNouH8" resolve="condition" />
@@ -2602,9 +2602,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3SIytSCCYpV" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1xo" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3SIytSCCYpW" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1xp" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/findUsages.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/findUsages.mps
index 126e8db40b9..e11c5b81649 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/findUsages.mps
@@ -65,6 +65,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -96,7 +97,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +135,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -187,7 +187,7 @@
                       <node concept="2OqwBi" id="5gnM8Apy3ln" role="3uHU7w">
                         <node concept="2OqwBi" id="5gnM8Apy3kS" role="2Oq$k0">
                           <node concept="37vLTw" id="5gnM8Apy3kz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2neBDhWStfv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1xq" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="5gnM8Apy3kY" role="2OqNvi">
                             <node concept="1xMEDy" id="5gnM8Apy3kZ" role="1xVPHs">
@@ -201,7 +201,7 @@
                       </node>
                       <node concept="2OqwBi" id="2neBDhWStfr" role="3uHU7B">
                         <node concept="37vLTw" id="2neBDhWStfs" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2neBDhWStfv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1xq" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="2neBDhWStft" role="2OqNvi">
                           <node concept="chp4Y" id="5gnM8Apy3kx" role="cj9EA">
@@ -212,9 +212,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2neBDhWStfv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1xq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2neBDhWStfw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1xr" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/intentions.mps
index a8c4c8f9ab4..74512b63998 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/intentions.mps
@@ -93,7 +93,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,6 +113,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -209,7 +210,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -224,7 +225,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -1056,7 +1056,7 @@
                         <node concept="37vLTI" id="6nD38mAIbtS" role="3clFbG">
                           <node concept="2OqwBi" id="6nD38mAIbhP" role="37vLTJ">
                             <node concept="37vLTw" id="6nD38mAIbf9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6nD38mAIbd6" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1xs" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6nD38mAIbm$" role="2OqNvi">
                               <ref role="3Tt5mk" to="qdv7:1wLq5fNouH9" resolve="replacement" />
@@ -1071,9 +1071,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6nD38mAIbd6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1xs" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6nD38mAIbd7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1xt" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1266,7 +1266,7 @@
                   <node concept="3clFbF" id="3yKJMlzsOcO" role="3cqZAp">
                     <node concept="37vLTI" id="3yKJMlzsRE7" role="3clFbG">
                       <node concept="37vLTw" id="3yKJMlzsRG2" role="37vLTx">
-                        <ref role="3cqZAo" node="3yKJMlzsOaj" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1xu" resolve="it" />
                       </node>
                       <node concept="2OqwBi" id="3yKJMlzsRcc" role="37vLTJ">
                         <node concept="37vLTw" id="3yKJMlzsR4b" role="2Oq$k0">
@@ -1294,9 +1294,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3yKJMlzsOaj" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1xu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3yKJMlzsOak" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1xv" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/plugin.mps
index 6eaa2168e1b..3e9d81a7956 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:b34a99b5-15cb-4dbe-ba4c-638edf0da733(com.mbeddr.cc.var.annotations.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/refactorings.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/refactorings.mps
index 8953489d3ad..b273ce91506 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/refactorings.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/refactorings.mps
@@ -48,7 +48,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -101,7 +101,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/structure.mps
index 32d7522f0f2..d76d02d985c 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/structure.mps
@@ -52,7 +52,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/typesystem.mps
index 92525d0e3f4..4ca2ddac385 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/languageModels/typesystem.mps
@@ -76,7 +76,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -91,6 +91,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -222,7 +223,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -234,7 +235,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -818,7 +818,7 @@
                         <property role="Xl_RC" value="cannot have two mappings for a single feature model" />
                       </node>
                       <node concept="37vLTw" id="4omMoHUB0jh" role="1urrMF">
-                        <ref role="3cqZAo" node="4omMoHUAPpS" resolve="m" />
+                        <ref role="3cqZAo" node="2SR9xrsN1xy" resolve="m" />
                       </node>
                     </node>
                   </node>
@@ -843,7 +843,7 @@
                                 <node concept="3clFbC" id="4omMoHUAW4P" role="3clFbG">
                                   <node concept="2OqwBi" id="4omMoHUAWqE" role="3uHU7w">
                                     <node concept="37vLTw" id="4omMoHUAWj7" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4omMoHUAPpS" resolve="m" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1xy" resolve="m" />
                                     </node>
                                     <node concept="3TrEf2" id="4omMoHUAWYj" role="2OqNvi">
                                       <ref role="3Tt5mk" to="qdv7:5JmNU9PAaLi" resolve="featureModel" />
@@ -851,7 +851,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4omMoHUAV4l" role="3uHU7B">
                                     <node concept="37vLTw" id="4omMoHUAUX4" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4omMoHUAULu" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1xw" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4omMoHUAVAf" role="2OqNvi">
                                       <ref role="3Tt5mk" to="qdv7:5JmNU9PAaLi" resolve="featureModel" />
@@ -860,9 +860,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4omMoHUAULu" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1xw" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4omMoHUAULv" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1xx" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -872,9 +872,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="4omMoHUAPpS" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1xy" role="1bW2Oz">
                 <property role="TrG5h" value="m" />
-                <node concept="2jxLKc" id="4omMoHUAPpT" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1xz" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps
index f5949e111c2..2e1ed9d09b0 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps
@@ -5,7 +5,7 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -57,7 +57,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -100,7 +100,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -109,7 +109,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -117,7 +117,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -133,7 +133,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd
index 8e9c8b7d43c..3b635c99803 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.var.annotations.pluginSolution" uuid="1e50ebe9-2a02-4ceb-ae53-da4d6f4c0c35" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.cc.var.annotations.pluginSolution" uuid="1e50ebe9-2a02-4ceb-ae53-da4d6f4c0c35" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -22,10 +21,10 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl
index 7e1600c11d7..dd43da23bda 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl
@@ -37,7 +37,7 @@
         <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -107,7 +107,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -141,7 +140,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -153,7 +151,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/template/main@generator.mps
index ba0f10b227c..df8f7d31433 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/template/main@generator.mps
@@ -63,7 +63,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -88,6 +88,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -122,7 +123,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +135,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -201,7 +201,7 @@
                       <node concept="3clFbF" id="4ha9sSdQLUl" role="3cqZAp">
                         <node concept="2OqwBi" id="4ha9sSdQLUm" role="3clFbG">
                           <node concept="37vLTw" id="4ha9sSdQLUn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ha9sSdQLUq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1y1" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4ha9sSdQLUo" role="2OqNvi">
                             <node concept="chp4Y" id="4ha9sSdQLUp" role="cj9EA">
@@ -211,9 +211,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4ha9sSdQLUq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1y1" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4ha9sSdQLUr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1y2" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -257,7 +257,7 @@
                         <node concept="3cpWs3" id="4omMoHU$VDy" role="2k5Stb">
                           <node concept="2OqwBi" id="4omMoHU$W62" role="3uHU7w">
                             <node concept="37vLTw" id="4omMoHU$VSu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4omMoHU$N5Z" resolve="mm" />
+                              <ref role="3cqZAo" node="2SR9xrsN1y3" resolve="mm" />
                             </node>
                             <node concept="2qgKlT" id="4omMoHU$X9P" role="2OqNvi">
                               <ref role="37wK5l" to="hwgx:4JF77iuPCMH" resolve="qualifiedName" />
@@ -274,9 +274,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4omMoHU$N5Z" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1y3" role="1bW2Oz">
                   <property role="TrG5h" value="mm" />
-                  <node concept="2jxLKc" id="4omMoHU$N60" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1y4" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/varcprocessor/util.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/varcprocessor/util.mps
index 6ada59881ea..34fc8482fb1 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/varcprocessor/util.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/generator/template/com/mbeddr/cc/var/c/generator/varcprocessor/util.mps
@@ -60,7 +60,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -72,12 +72,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -115,7 +116,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -137,7 +138,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -189,7 +189,7 @@
                           <node concept="3clFbF" id="5aNdPeN4kh0" role="3cqZAp">
                             <node concept="2OqwBi" id="5aNdPeN4kh1" role="3clFbG">
                               <node concept="37vLTw" id="5aNdPeN4kh2" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5aNdPeN4kh5" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1y5" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="5aNdPeN4kh3" role="2OqNvi">
                                 <node concept="chp4Y" id="5aNdPeN4kh4" role="cj9EA">
@@ -199,9 +199,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5aNdPeN4kh5" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1y5" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5aNdPeN4kh6" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1y6" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -243,7 +243,7 @@
                             <node concept="3clFbF" id="5aNdPeN4kjG" role="3cqZAp">
                               <node concept="2OqwBi" id="5aNdPeN4kjH" role="3clFbG">
                                 <node concept="37vLTw" id="5aNdPeN4kjI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5aNdPeN4kjL" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1y7" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5aNdPeN4kjJ" role="2OqNvi">
                                   <ref role="37wK5l" to="rpdm:5JmNU9PAaKn" resolve="isSelectedInTransformationConfiguration" />
@@ -254,9 +254,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5aNdPeN4kjL" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1y7" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5aNdPeN4kjM" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1y8" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/behavior.mps
index 5a1499717d0..6981b03d22d 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/behavior.mps
@@ -82,7 +82,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,12 +90,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -123,7 +124,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -131,7 +132,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -163,7 +163,7 @@
                     <node concept="3clFbF" id="5aNdPeN2LVx" role="3cqZAp">
                       <node concept="2OqwBi" id="5aNdPeN2LVy" role="3clFbG">
                         <node concept="37vLTw" id="5aNdPeN2LVz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5aNdPeN2LV_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1xY" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5aNdPeN2LV$" role="2OqNvi">
                           <ref role="37wK5l" to="rpdm:2h6lNbWo02u" resolve="isSelectedInRenderingConfiguration" />
@@ -171,9 +171,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5aNdPeN2LV_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1xY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5aNdPeN2LVA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1xZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/editor.mps
index 83307be23f5..042404cc796 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/editor.mps
@@ -58,7 +58,7 @@
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="1182233249301" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_childNode" flags="nn" index="12_Ws6" />
       <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1219226236603" name="jetbrains.mps.lang.editor.structure.DrawBracketsStyleClassItem" flags="ln" index="3vyZuw" />
@@ -75,7 +75,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -119,7 +119,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -145,7 +145,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/intentions.mps
index efc40031630..1b3f80eccab 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/intentions.mps
@@ -55,7 +55,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -122,7 +122,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/structure.mps
index eb6355f122d..d7fefcc4254 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/structure.mps
@@ -36,7 +36,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/typesystem.mps
index 5fe0cce9e5d..bda44c0e389 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/languageModels/typesystem.mps
@@ -47,7 +47,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl
index 92a88cdb5ef..a66396fae08 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl
@@ -41,7 +41,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -116,7 +116,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -127,7 +126,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -203,7 +202,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>21ac77a4-1b66-44c5-aaec-94e43bb86519(com.mbeddr.cc.var.composition)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/generator/template/main@generator.mps
index e4d7f43829c..2e2d755b957 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/generator/template/main@generator.mps
@@ -54,7 +54,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,6 +93,7 @@
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -116,7 +117,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -124,7 +125,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -161,7 +161,7 @@
                                 <node concept="2OqwBi" id="5B$wwdf9jHv" role="3uHU7B">
                                   <node concept="2JrnkZ" id="5B$wwdf9jHw" role="2Oq$k0">
                                     <node concept="37vLTw" id="5B$wwdf9jHx" role="2JrQYb">
-                                      <ref role="3cqZAo" node="5B$wwdf9jH$" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1yo" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5B$wwdf9jHy" role="2OqNvi">
@@ -174,9 +174,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5B$wwdf9jH$" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1yo" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5B$wwdf9jH_" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1yp" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/behavior.mps
index 73ae62a0641..bcd198c1503 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/behavior.mps
@@ -90,7 +90,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,7 +102,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -111,6 +111,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -193,7 +194,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -218,7 +219,6 @@
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -376,15 +376,15 @@
                           <node concept="3clFbF" id="5B$wwdfd8yC" role="3cqZAp">
                             <node concept="2OqwBi" id="5B$wwdfd8Fl" role="3clFbG">
                               <node concept="37vLTw" id="5B$wwdfd8yB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5B$wwdfd8ti" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1y9" resolve="it" />
                               </node>
                               <node concept="1$rogu" id="5B$wwdfdc1R" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5B$wwdfd8ti" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1y9" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5B$wwdfd8tj" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1ya" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -432,15 +432,15 @@
                           <node concept="3clFbF" id="5B$wwdfejmH" role="3cqZAp">
                             <node concept="2OqwBi" id="5B$wwdfejmI" role="3clFbG">
                               <node concept="37vLTw" id="5B$wwdfejmJ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5B$wwdfejmL" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1yb" resolve="it" />
                               </node>
                               <node concept="1$rogu" id="5B$wwdfejmK" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5B$wwdfejmL" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1yb" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5B$wwdfejmM" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1yc" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -490,15 +490,15 @@
                           </node>
                           <node concept="2Ke4WJ" id="5B$wwdfeIct" role="2OqNvi">
                             <node concept="37vLTw" id="5B$wwdfeIle" role="25WWJ7">
-                              <ref role="3cqZAo" node="5B$wwdfeB7H" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1yd" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5B$wwdfeB7H" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1yd" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5B$wwdfeB7I" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1ye" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -547,7 +547,7 @@
                           <node concept="2OqwBi" id="5B$wwdfkzrx" role="3clFbG">
                             <node concept="2OqwBi" id="5B$wwdfkzry" role="2Oq$k0">
                               <node concept="37vLTw" id="5B$wwdfkzrz" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5B$wwdfkzrB" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1yf" resolve="it" />
                               </node>
                               <node concept="3CFZ6_" id="5B$wwdfkzr$" role="2OqNvi">
                                 <node concept="3CFYIy" id="5B$wwdfkzr_" role="3CFYIz">
@@ -559,9 +559,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5B$wwdfkzrB" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1yf" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5B$wwdfkzrC" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1yg" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -588,7 +588,7 @@
                             <node concept="2OqwBi" id="5B$wwdfkQt4" role="2Oq$k0">
                               <node concept="2OqwBi" id="5B$wwdfkQt5" role="2Oq$k0">
                                 <node concept="37vLTw" id="5B$wwdfkQt6" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5B$wwdfkQth" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1yh" resolve="it" />
                                 </node>
                                 <node concept="3CFZ6_" id="5B$wwdfkQt7" role="2OqNvi">
                                   <node concept="3CFYIy" id="5B$wwdfkQt8" role="3CFYIz">
@@ -622,9 +622,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5B$wwdfkQth" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1yh" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5B$wwdfkQti" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1yi" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -787,7 +787,7 @@
                       </node>
                       <node concept="2OqwBi" id="12n15PAcKgQ" role="3uHU7B">
                         <node concept="37vLTw" id="12n15PAcJWy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="12n15PAcJRZ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1yj" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="12n15PAcKWE" role="2OqNvi">
                           <ref role="3Tt5mk" to="x27k:5ak6HMA0red" resolve="function" />
@@ -796,9 +796,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="12n15PAcJRZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yj" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="12n15PAcJS0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yk" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/constraints.mps
index 1ce7055bc3c..a5e5b9c9790 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/constraints.mps
@@ -45,6 +45,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -78,7 +79,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -87,7 +88,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="1M2fIO" id="5B$wwdf7iOH">
@@ -107,7 +107,7 @@
                     <node concept="2OqwBi" id="79i$vAY7ixt" role="3clFbG">
                       <node concept="2OqwBi" id="79i$vAY7ixu" role="2Oq$k0">
                         <node concept="37vLTw" id="79i$vAY7ixv" role="2Oq$k0">
-                          <ref role="3cqZAo" node="79i$vAY7ixz" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1yl" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="79i$vAY7ixw" role="2OqNvi">
                           <node concept="3CFYIy" id="79i$vAY7ixx" role="3CFYIz">
@@ -119,9 +119,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="79i$vAY7ixz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yl" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="79i$vAY7ix$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1ym" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/editor.mps
index e5a7356f082..666b76328d7 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/editor.mps
@@ -30,7 +30,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -46,7 +46,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/structure.mps
index 4efd431c004..20089b19cc3 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/structure.mps
@@ -40,7 +40,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/typesystem.mps
index f9a671561d0..324bcfc025e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/languageModels/typesystem.mps
@@ -154,7 +154,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl
index d6a3bbc0f79..e9dfa9d97a1 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl
@@ -40,7 +40,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -108,7 +108,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_after">
@@ -142,7 +141,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -156,7 +154,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -236,7 +234,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/com/mbeddr/cc/var/composition/generator/util.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/com/mbeddr/cc/var/composition/generator/util.mps
index a70ac357175..e53faae507f 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/com/mbeddr/cc/var/composition/generator/util.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/com/mbeddr/cc/var/composition/generator/util.mps
@@ -85,7 +85,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -96,7 +96,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -104,6 +104,7 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -151,7 +152,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -180,7 +181,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
@@ -487,7 +487,7 @@
                     <node concept="1rXfSq" id="5B$wwdf8qSN" role="3clFbG">
                       <ref role="37wK5l" node="5B$wwdf8oaj" resolve="flattenHelper" />
                       <node concept="37vLTw" id="5B$wwdf8qXC" role="37wK5m">
-                        <ref role="3cqZAo" node="5B$wwdf8qOp" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1yB" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="5B$wwdf8r79" role="37wK5m">
                         <ref role="3cqZAo" node="5B$wwdf8nAb" resolve="flattened" />
@@ -495,9 +495,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5B$wwdf8qOp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5B$wwdf8qOq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -560,7 +560,7 @@
                         <node concept="1rXfSq" id="5B$wwdf8w__" role="3clFbG">
                           <ref role="37wK5l" node="5B$wwdf8oaj" resolve="flattenHelper" />
                           <node concept="37vLTw" id="5B$wwdf8wEZ" role="37wK5m">
-                            <ref role="3cqZAo" node="5B$wwdf8wwp" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yD" resolve="it" />
                           </node>
                           <node concept="37vLTw" id="5B$wwdf8wQy" role="37wK5m">
                             <ref role="3cqZAo" node="5B$wwdf8rpj" resolve="flattened" />
@@ -568,9 +568,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5B$wwdf8wwp" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1yD" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5B$wwdf8wwq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1yE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/main@generator.mps
index 897138de99c..7462b37af6a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/generator/template/main@generator.mps
@@ -68,7 +68,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -152,7 +152,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/behavior.mps
index f576ba85b15..aa7f41eb642 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/behavior.mps
@@ -135,7 +135,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -155,7 +155,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -165,6 +165,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -225,7 +226,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -262,7 +263,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -396,15 +396,15 @@
                   <node concept="3clFbF" id="3YyHFqO8OQS" role="3cqZAp">
                     <node concept="2OqwBi" id="3YyHFqO8OU4" role="3clFbG">
                       <node concept="37vLTw" id="3YyHFqO8OQR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3YyHFqO8OOb" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1yq" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="3YyHFqO8PmB" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3YyHFqO8OOb" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3YyHFqO8OOc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -691,7 +691,7 @@
                   <node concept="3clFbF" id="5B$wwdfht4r" role="3cqZAp">
                     <node concept="2OqwBi" id="5B$wwdfht4s" role="3clFbG">
                       <node concept="37vLTw" id="5B$wwdfht4t" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5B$wwdfht4x" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1ys" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5B$wwdfht4u" role="2OqNvi">
                         <node concept="25Kdxt" id="5B$wwdfht4v" role="cj9EA">
@@ -703,9 +703,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5B$wwdfht4x" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1ys" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5B$wwdfht4y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -931,15 +931,15 @@
                             <node concept="liA8E" id="5B$wwdf8f9q" role="2OqNvi">
                               <ref role="37wK5l" node="5B$wwdf7VMX" resolve="addSubResult" />
                               <node concept="37vLTw" id="5B$wwdf8fem" role="37wK5m">
-                                <ref role="3cqZAo" node="5B$wwdf8eIX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1yu" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5B$wwdf8eIX" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1yu" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5B$wwdf8eIY" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1yv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/constraints.mps
index 5be5c4bd343..ccc5ed48443 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/constraints.mps
@@ -38,7 +38,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -57,6 +57,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -95,7 +96,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -103,7 +104,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -170,7 +170,7 @@
                         <node concept="2OqwBi" id="5CkU_dHidsI" role="3clFbG">
                           <node concept="2OqwBi" id="5CkU_dHidsJ" role="2Oq$k0">
                             <node concept="37vLTw" id="5CkU_dHidsK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHidsO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1yw" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="5CkU_dHidsL" role="2OqNvi">
                               <node concept="3CFYIy" id="5CkU_dHidsM" role="3CFYIz">
@@ -182,9 +182,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHidsO" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1yw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHidsP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1yx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/editor.mps
index 9ba504fcb52..06f6e4315bc 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/editor.mps
@@ -65,7 +65,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -86,7 +86,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -123,7 +123,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -144,7 +144,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/intentions.mps
index abb87bd85af..940d48052ed 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/intentions.mps
@@ -59,6 +59,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -111,7 +112,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -120,7 +121,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="2S6QgY" id="3YyHFqO14wO">
@@ -373,7 +373,7 @@
                         <node concept="2OqwBi" id="5be2k4jY8Sd" role="2Oq$k0">
                           <node concept="2OqwBi" id="5be2k4jY7_U" role="2Oq$k0">
                             <node concept="37vLTw" id="5be2k4jY75f" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5be2k4jY5u8" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1yy" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="5be2k4jY8pB" role="2OqNvi">
                               <node concept="3CFYIy" id="5be2k4jY8EU" role="3CFYIz">
@@ -394,7 +394,7 @@
                       <node concept="3y3z36" id="5be2k4jY6vk" role="3uHU7B">
                         <node concept="2OqwBi" id="5be2k4jY5LA" role="3uHU7B">
                           <node concept="37vLTw" id="5be2k4jY5Gg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5be2k4jY5u8" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yy" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="5be2k4jY60C" role="2OqNvi">
                             <node concept="3CFYIy" id="5be2k4jY6hV" role="3CFYIz">
@@ -407,9 +407,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5be2k4jY5u8" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yy" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5be2k4jY5u9" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yz" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/structure.mps
index 4a0bd432d6e..33e51825bf7 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/structure.mps
@@ -47,7 +47,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/typesystem.mps
index 46d58059ef6..61ce58edbf9 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/languageModels/typesystem.mps
@@ -51,7 +51,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -64,6 +64,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -129,7 +130,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -137,7 +138,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -300,7 +300,7 @@
                       <node concept="10Nm6u" id="5B$wwdfb7A8" role="3uHU7w" />
                       <node concept="2OqwBi" id="5B$wwdfb7A9" role="3uHU7B">
                         <node concept="37vLTw" id="5B$wwdfb7Aa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5B$wwdfb7Ad" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1y$" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="5B$wwdfb7Ab" role="2OqNvi">
                           <node concept="3CFYIy" id="5B$wwdfb7Ac" role="3CFYIz">
@@ -311,9 +311,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5B$wwdfb7Ad" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1y$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5B$wwdfb7Ae" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1y_" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl
index 275c757eee5..e097a55f58a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -39,7 +38,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -61,7 +60,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -125,7 +124,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/behavior.mps
index ea2cb49d348..ee0328c3bad 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/behavior.mps
@@ -53,7 +53,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -149,7 +149,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -166,7 +166,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -182,6 +182,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -260,7 +261,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -298,7 +299,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -1018,7 +1018,7 @@
                             </node>
                             <node concept="2OqwBi" id="5USXI9Kzg6C" role="3uHU7B">
                               <node concept="37vLTw" id="5USXI9Kzg6D" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5USXI9Kzg6F" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1yF" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5USXI9Kzg6E" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -1027,9 +1027,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5USXI9Kzg6F" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1yF" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5USXI9Kzg6G" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1yG" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1302,7 +1302,7 @@
                         <node concept="2OqwBi" id="1qn9LsHSWTU" role="3fr31v">
                           <node concept="2OqwBi" id="1qn9LsHSWTV" role="2Oq$k0">
                             <node concept="37vLTw" id="1qn9LsHSWTW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1qn9LsHSTNA" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1yH" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1qn9LsHSWTX" role="2OqNvi">
                               <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaj" resolve="constraint" />
@@ -1317,9 +1317,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1qn9LsHSTNA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1yH" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1qn9LsHSTNB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1yI" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1476,7 +1476,7 @@
                               <node concept="3cpWs3" id="5YZjOkv$ArB" role="37wK5m">
                                 <node concept="2OqwBi" id="5YZjOkv$ArZ" role="3uHU7w">
                                   <node concept="37vLTw" id="5YZjOkv$ArE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5YZjOkv$Apg" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1yJ" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="5YZjOkv$As5" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1486,7 +1486,7 @@
                                   <node concept="2OqwBi" id="5YZjOkv$AqO" role="3uHU7B">
                                     <node concept="2OqwBi" id="5YZjOkv$Aqo" role="2Oq$k0">
                                       <node concept="37vLTw" id="5YZjOkv$ApJ" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5YZjOkv$Apg" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1yJ" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="5YZjOkv$Aqu" role="2OqNvi">
                                         <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1505,9 +1505,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5YZjOkv$Apg" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1yJ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5YZjOkv$Aph" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1yK" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1746,7 +1746,7 @@
                   <node concept="3clFbF" id="5YZjOkv$zSX" role="3cqZAp">
                     <node concept="2OqwBi" id="5YZjOkv$zTj" role="3clFbG">
                       <node concept="37vLTw" id="5YZjOkv$zSY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5YZjOkv$zSV" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1yL" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="5YZjOkv$zTp" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:6xkj9mMr7e" resolve="visualize" />
@@ -1760,9 +1760,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5YZjOkv$zSV" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yL" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5YZjOkv$zSW" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yM" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1838,7 +1838,7 @@
                       </node>
                       <node concept="2OqwBi" id="7H6_Qip5NFh" role="3uHU7B">
                         <node concept="37vLTw" id="7H6_Qip5NEW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7H6_Qip5NET" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1yN" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7H6_Qip5NFn" role="2OqNvi">
                           <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -1847,9 +1847,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7H6_Qip5NET" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yN" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7H6_Qip5NEU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yO" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1895,7 +1895,7 @@
                         </node>
                         <node concept="2OqwBi" id="6W8yq39onD$" role="3uHU7B">
                           <node concept="37vLTw" id="6W8yq39onD_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6W8yq39onDB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yP" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6W8yq39onDA" role="2OqNvi">
                             <ref role="3Tt5mk" to="qqyh:5USXI9Kzba7" resolve="attribute" />
@@ -1904,9 +1904,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6W8yq39onDB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1yP" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6W8yq39onDC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1yQ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1974,7 +1974,7 @@
                   <node concept="3clFbF" id="5MNZoCA0MZ_" role="3cqZAp">
                     <node concept="2OqwBi" id="5MNZoCA0N7S" role="3clFbG">
                       <node concept="37vLTw" id="5MNZoCA0MZ$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5MNZoCA0MAg" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1yR" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="5MNZoCA0ONM" role="2OqNvi">
                         <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -1982,9 +1982,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5MNZoCA0MAg" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yR" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5MNZoCA0MAh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yS" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2182,14 +2182,14 @@
                             <ref role="3cqZAo" node="3MTLjr1$Yk2" resolve="sequence" />
                           </node>
                           <node concept="37vLTw" id="3MTLjr1$YlU" role="37wK5m">
-                            <ref role="3cqZAo" node="3MTLjr1$YlO" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yT" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3MTLjr1$YlO" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1yT" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3MTLjr1$YlP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1yU" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2252,7 +2252,7 @@
                       <node concept="2OqwBi" id="3MTLjr1_0xN" role="3uHU7w">
                         <node concept="2OqwBi" id="3MTLjr1_0xo" role="2Oq$k0">
                           <node concept="37vLTw" id="3MTLjr1_0x3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MTLjr1_0vP" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yV" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3MTLjr1_0xt" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2268,7 +2268,7 @@
                       <node concept="3y3z36" id="3MTLjr1_0wC" role="3uHU7B">
                         <node concept="2OqwBi" id="3MTLjr1_0wd" role="3uHU7B">
                           <node concept="37vLTw" id="3MTLjr1_0vS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MTLjr1_0vP" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yV" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3MTLjr1_0wi" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2279,9 +2279,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3MTLjr1_0vP" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yV" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3MTLjr1_0vQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yW" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2322,7 +2322,7 @@
                       <node concept="2OqwBi" id="3MTLjr1_0$o" role="3uHU7w">
                         <node concept="2OqwBi" id="3MTLjr1_0zX" role="2Oq$k0">
                           <node concept="37vLTw" id="3MTLjr1_0zC" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MTLjr1_0yq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yX" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3MTLjr1_0$2" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2338,7 +2338,7 @@
                       <node concept="3y3z36" id="3MTLjr1_0zd" role="3uHU7B">
                         <node concept="2OqwBi" id="3MTLjr1_0yM" role="3uHU7B">
                           <node concept="37vLTw" id="3MTLjr1_0yt" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MTLjr1_0yq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1yX" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3MTLjr1_0yR" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2349,9 +2349,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3MTLjr1_0yq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1yX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3MTLjr1_0yr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1yY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2475,7 +2475,7 @@
                             <node concept="2OqwBi" id="7wwb0Bt9YyS" role="3fr31v">
                               <node concept="2OqwBi" id="7wwb0Bt9YyT" role="2Oq$k0">
                                 <node concept="37vLTw" id="7wwb0Bt9YyU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7wwb0Bt9YyO" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1yZ" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7wwb0Bt9YyV" role="2OqNvi">
                                   <ref role="3Tt5mk" to="qdv7:3UhOf8WVZaz" resolve="value" />
@@ -2488,9 +2488,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7wwb0Bt9YyO" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1yZ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7wwb0Bt9YyP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1z0" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2936,14 +2936,14 @@
                         </node>
                       </node>
                       <node concept="37vLTw" id="5MNZoCA11cr" role="3uHU7B">
-                        <ref role="3cqZAo" node="5MNZoCA11cs" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1z1" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5MNZoCA11cs" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1z1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5MNZoCA11ct" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1z2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3055,14 +3055,14 @@
                           </node>
                         </node>
                         <node concept="37vLTw" id="5MNZoCA1i_f" role="3uHU7B">
-                          <ref role="3cqZAo" node="5MNZoCA1i_g" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1z3" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5MNZoCA1i_g" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1z3" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5MNZoCA1i_h" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1z4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/constraints.mps
index 97a6c4829c0..c3437de9e17 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/constraints.mps
@@ -88,7 +88,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -136,6 +136,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -208,7 +209,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -246,7 +247,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -739,7 +739,7 @@
                         <node concept="3clFbF" id="5CkU_dHidz_" role="3cqZAp">
                           <node concept="2OqwBi" id="5CkU_dHidzA" role="3clFbG">
                             <node concept="37vLTw" id="5CkU_dHidzB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHidzD" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1z5" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5CkU_dHidzC" role="2OqNvi">
                               <ref role="37wK5l" to="g0zr:5USXI9KzbbI" resolve="allSelectableFeatures" />
@@ -747,9 +747,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHidzD" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1z5" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHidzE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1z6" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -809,7 +809,7 @@
                             <node concept="2OqwBi" id="5CkU_dHidzW" role="2Oq$k0">
                               <node concept="2yIwOk" id="5CkU_dHidzX" role="2OqNvi" />
                               <node concept="37vLTw" id="5CkU_dHidzY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHid$1" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1z7" resolve="it" />
                               </node>
                             </node>
                             <node concept="3O6GUB" id="5CkU_dHidzZ" role="2OqNvi">
@@ -820,9 +820,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHid$1" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1z7" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHid$2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1z8" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/editor.mps
index 7ed6a51b992..9367fa8d3d4 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/editor.mps
@@ -21,7 +21,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -48,7 +48,7 @@
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
@@ -76,7 +76,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -114,7 +114,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -197,7 +197,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -209,6 +209,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -249,7 +250,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -258,7 +259,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
@@ -422,7 +422,7 @@
                                 <node concept="3cpWs3" id="5USXI9Kzbef" role="37vLTx">
                                   <node concept="2OqwBi" id="5USXI9Kzbeg" role="3uHU7B">
                                     <node concept="37vLTw" id="5USXI9Kzbeh" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5USXI9Kzbel" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1z9" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="5USXI9Kzbei" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -438,9 +438,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5USXI9Kzbel" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1z9" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5USXI9Kzbem" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1za" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1246,7 +1246,7 @@
                                 <node concept="3cpWs3" id="7mpzbZX8spi" role="37vLTx">
                                   <node concept="2OqwBi" id="7mpzbZX8spj" role="3uHU7B">
                                     <node concept="37vLTw" id="7mpzbZX8spk" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7mpzbZX8spo" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1zb" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="7mpzbZX8spl" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1262,9 +1262,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7mpzbZX8spo" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1zb" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7mpzbZX8spp" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1zc" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/intentions.mps
index cffe295200e..4788132295a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/intentions.mps
@@ -102,6 +102,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -172,7 +173,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -202,7 +203,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -798,7 +798,7 @@
                         <node concept="2OqwBi" id="6Ce4x7LgY53" role="25WWJ7">
                           <node concept="2OqwBi" id="6Ce4x7LgRL1" role="2Oq$k0">
                             <node concept="37vLTw" id="6Ce4x7LtQy2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Ce4x7LtPpp" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1zd" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6Ce4x7LgVFo" role="2OqNvi">
                               <ref role="3Tt5mk" to="qqyh:6Ce4x7KSUoM" resolve="feature" />
@@ -816,9 +816,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Ce4x7LtPpp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1zd" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Ce4x7LtPpq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1ze" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -887,7 +887,7 @@
                       <node concept="3clFbC" id="7mpzbZXehaG" role="3clFbG">
                         <node concept="2OqwBi" id="7mpzbZXehaH" role="3uHU7B">
                           <node concept="37vLTw" id="7mpzbZXehaI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7mpzbZXehaL" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1zf" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7mpzbZXehaJ" role="2OqNvi">
                             <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -897,9 +897,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7mpzbZXehaL" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1zf" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7mpzbZXehaM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1zg" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/migration.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/migration.mps
index 6c01d8449e6..f412cd7080c 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -35,7 +35,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -57,7 +57,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/plugin.mps
index ec89727efe2..0027878e23e 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:c62a2d53-129a-491e-a4fe-41c9d62bd66d(com.mbeddr.cc.var.fm.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps
index 5626f5698a6..5cfee875d78 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps
@@ -80,7 +80,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/typesystem.mps
index 7334b73e8c5..62cc9d5ef1b 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/typesystem.mps
@@ -73,7 +73,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,6 +90,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -184,7 +185,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -222,7 +223,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -424,7 +424,7 @@
                             </node>
                             <node concept="2OqwBi" id="5USXI9KzbgP" role="3uHU7B">
                               <node concept="37vLTw" id="5USXI9KzbgQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5USXI9KzbgS" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1zh" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5USXI9KzbgR" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qqyh:5USXI9Kzbah" resolve="feature" />
@@ -433,9 +433,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5USXI9KzbgS" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1zh" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5USXI9KzbgT" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1zi" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -533,7 +533,7 @@
                             </node>
                             <node concept="2OqwBi" id="5USXI9Kzbhz" role="3uHU7B">
                               <node concept="37vLTw" id="5USXI9Kzbh$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5USXI9KzbhA" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1zj" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5USXI9Kzbh_" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qqyh:5USXI9Kzba7" resolve="attribute" />
@@ -542,9 +542,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5USXI9KzbhA" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1zj" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5USXI9KzbhB" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1zk" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -666,7 +666,7 @@
                     <node concept="17QB3L" id="3rVIKr67EDz" role="1tU5fm" />
                     <node concept="2OqwBi" id="3rVIKr67EDA" role="33vP2m">
                       <node concept="37vLTw" id="3rVIKr67EDB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3rVIKr67nu8" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1zl" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="3rVIKr67EDC" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -684,7 +684,7 @@
                         <ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
                       </node>
                       <node concept="37vLTw" id="3rVIKr67yoK" role="1urrMF">
-                        <ref role="3cqZAo" node="3rVIKr67nu8" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1zl" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -712,9 +712,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="3rVIKr67nu8" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1zl" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="3rVIKr67nu9" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1zm" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -812,7 +812,7 @@
                     <node concept="3fqX7Q" id="6hM2_xW4JWz" role="3clFbG">
                       <node concept="2OqwBi" id="6hM2_xW4Keg" role="3fr31v">
                         <node concept="37vLTw" id="6hM2_xW4K2T" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hM2_xW4JOp" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1zn" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="6hM2_xW4L6_" role="2OqNvi">
                           <node concept="chp4Y" id="6hM2_xW4LfL" role="cj9EA">
@@ -823,9 +823,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6hM2_xW4JOp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1zn" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6hM2_xW4JOq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1zo" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -846,7 +846,7 @@
                           <node concept="2OqwBi" id="79i$vAY7iO1" role="2Oq$k0">
                             <node concept="2yIwOk" id="79i$vAY7iO2" role="2OqNvi" />
                             <node concept="37vLTw" id="6hM2_xW66gh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6hM2_xW3iry" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1zp" resolve="it" />
                             </node>
                           </node>
                           <node concept="liA8E" id="79i$vAY7iO3" role="2OqNvi">
@@ -867,7 +867,7 @@
                         <property role="Xl_RC" value="binary expressions cannot be nested in feature conditions" />
                       </node>
                       <node concept="37vLTw" id="6hM2_xW3lES" role="1urrMF">
-                        <ref role="3cqZAo" node="6hM2_xW3iry" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1zp" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -875,7 +875,7 @@
                     <node concept="2OqwBi" id="6hM2_xW6tsT" role="3uHU7w">
                       <node concept="2OqwBi" id="6hM2_xW6rAB" role="2Oq$k0">
                         <node concept="37vLTw" id="6hM2_xW6rpb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hM2_xW3iry" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1zp" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6hM2_xW6sOt" role="2OqNvi">
                           <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -890,7 +890,7 @@
                     <node concept="2OqwBi" id="6hM2_xW6pt7" role="3uHU7B">
                       <node concept="2OqwBi" id="6hM2_xW6nGp" role="2Oq$k0">
                         <node concept="37vLTw" id="6hM2_xW6nw$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hM2_xW3iry" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1zp" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6hM2_xW6oQi" role="2OqNvi">
                           <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
@@ -905,9 +905,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6hM2_xW3iry" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1zp" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="6hM2_xW3irz" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1zq" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl
index 7980d986e9d..7c0e1d21f33 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl
@@ -45,7 +45,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -112,7 +112,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -132,7 +131,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
     <dependency reexport="false">e401b447-8019-4ccd-a72c-bfb0230f5782(com.mbeddr.cc.var.fm)</dependency>
@@ -143,7 +141,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -223,7 +221,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/generator/template/com/mbeddr/cc/var/rt/comp/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/generator/template/com/mbeddr/cc/var/rt/comp/generator/template/main@generator.mps
index 75c631c0434..5d461652f3a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/generator/template/com/mbeddr/cc/var/rt/comp/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/generator/template/com/mbeddr/cc/var/rt/comp/generator/template/main@generator.mps
@@ -31,7 +31,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -117,12 +117,12 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -132,7 +132,7 @@
       </concept>
     </language>
     <language id="b8eeb935-038d-48d8-ae7f-0c6768b8d4fc" name="com.mbeddr.cc.var.rt">
-      <concept id="8000796061690156840" name="com.mbeddr.cc.var.rt.structure.IConfigModelSelector" flags="ng" index="2Aq_U8">
+      <concept id="8000796061690156840" name="com.mbeddr.cc.var.rt.structure.IConfigModelSelector" flags="ngI" index="2Aq_U8">
         <reference id="8000796061690159789" name="rtFeatureModel" index="2AqAGd" />
         <reference id="8000796061690159814" name="configModel" index="2AqAHA" />
       </concept>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/behavior.mps
index 1e5e318df77..4b378a711b7 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/behavior.mps
@@ -40,7 +40,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/constraints.mps
index e5ee0a1f5de..bd80c8a4fe1 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/constraints.mps
@@ -50,7 +50,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -82,6 +82,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -111,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -119,7 +120,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -183,7 +183,7 @@
                           <node concept="3clFbC" id="5CkU_dHie2i" role="3uHU7w">
                             <node concept="2OqwBi" id="5CkU_dHie2j" role="3uHU7B">
                               <node concept="37vLTw" id="5CkU_dHie2k" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHie2z" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1zr" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5CkU_dHie2l" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaa" resolve="configures" />
@@ -226,9 +226,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHie2z" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1zr" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHie2$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1zs" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/editor.mps
index 3110e53e562..41d179d3b67 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/editor.mps
@@ -26,7 +26,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/structure.mps
index d6275a49670..42430169f89 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/structure.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/typesystem.mps
index 9283badd103..5ba1ed9e58d 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/languageModels/typesystem.mps
@@ -93,7 +93,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/generator/template/com/mbeddr/cc/var/rt/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/generator/template/com/mbeddr/cc/var/rt/generator/template/main@generator.mps
index d9f7b7156ed..56ad0503bc4 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/generator/template/com/mbeddr/cc/var/rt/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/generator/template/com/mbeddr/cc/var/rt/generator/template/main@generator.mps
@@ -158,6 +158,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -280,7 +281,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -744,7 +744,7 @@
                                       <ref role="3cqZAo" node="7H6_Qip5NAB" resolve="n" />
                                     </node>
                                     <node concept="37vLTw" id="7H6_Qip5NBl" role="3GDnbk">
-                                      <ref role="3cqZAo" node="7H6_Qip5NA$" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1zP" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3GDn8_" id="7H6_Qip5NCp" role="3cqZAp">
@@ -760,9 +760,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="7H6_Qip5NA$" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1zP" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7H6_Qip5NA_" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1zQ" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -903,16 +903,16 @@
                                           <node concept="2qgKlT" id="6W8yq39oogr" role="2OqNvi">
                                             <ref role="37wK5l" to="g0zr:6W8yq39ois4" resolve="getValueNodeForAttribute" />
                                             <node concept="37vLTw" id="6W8yq39oogw" role="37wK5m">
-                                              <ref role="3cqZAo" node="6W8yq39oofh" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1zR" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="6W8yq39oofh" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1zR" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="6W8yq39oofi" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1zS" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -951,7 +951,7 @@
                                       <ref role="3cqZAo" node="6W8yq39oiqV" resolve="n" />
                                     </node>
                                     <node concept="37vLTw" id="6W8yq39oir7" role="3GDnbk">
-                                      <ref role="3cqZAo" node="6W8yq39oird" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1zT" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3GDn8_" id="6W8yq39oir8" role="3cqZAp">
@@ -967,9 +967,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6W8yq39oird" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1zT" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6W8yq39oire" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1zU" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/behavior.mps
index 5d92b610a82..e6fe12747c0 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/behavior.mps
@@ -80,7 +80,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -89,12 +89,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -153,7 +154,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -164,7 +165,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -319,7 +319,7 @@
                     <node concept="3eOSWO" id="3el1Vh3VSbT" role="3clFbG">
                       <node concept="2OqwBi" id="3el1Vh3VSbU" role="3uHU7B">
                         <node concept="37vLTw" id="3el1Vh3VSbV" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3el1Vh3VSbY" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1zu" resolve="it" />
                         </node>
                         <node concept="2bSWHS" id="3el1Vh3VSbW" role="2OqNvi" />
                       </node>
@@ -329,9 +329,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3el1Vh3VSbY" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1zu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3el1Vh3VSbZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1zv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -358,7 +358,7 @@
                     <node concept="3clFbF" id="3el1Vh3VD7B" role="3cqZAp">
                       <node concept="2OqwBi" id="3el1Vh3VD6P" role="3clFbG">
                         <node concept="37vLTw" id="3el1Vh3VD7C" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3el1Vh3VD7_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1zw" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3el1Vh3VD6R" role="2OqNvi">
                           <node concept="chp4Y" id="3el1Vh3VD6S" role="cj9EA">
@@ -368,9 +368,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3el1Vh3VD7_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1zw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3el1Vh3VD7A" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1zx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/constraints.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/constraints.mps
index 656736a98f3..b3a06908cb0 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/constraints.mps
@@ -43,7 +43,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -76,6 +76,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -124,7 +125,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -132,7 +133,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -425,7 +425,7 @@
                           </node>
                           <node concept="2OqwBi" id="5CkU_dHiefn" role="3uHU7B">
                             <node concept="37vLTw" id="5CkU_dHiefo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHiefq" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1zE" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5CkU_dHiefp" role="2OqNvi">
                               <ref role="3Tt5mk" to="qqyh:5USXI9Kzbaa" resolve="configures" />
@@ -434,9 +434,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHiefq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1zE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHiefr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1zF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/dataFlow.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/dataFlow.mps
index 68d6cf17439..d68ad0f3ccf 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/dataFlow.mps
@@ -66,7 +66,7 @@
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +127,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/editor.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/editor.mps
index 3d1e48e6b26..cfb1774e6e1 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/editor.mps
@@ -60,7 +60,7 @@
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -77,7 +77,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -97,19 +97,19 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
         <reference id="843003353410421234" name="concept" index="1FNNbB" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="3647146066980922272" name="jetbrains.mps.lang.editor.structure.SelectInEditorOperation" flags="nn" index="1OKiuA">
@@ -172,7 +172,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -209,7 +209,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/intentions.mps
index e8ccacfab48..0cfcf8a6ec3 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/intentions.mps
@@ -57,7 +57,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/typesystem.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/typesystem.mps
index 9be5d723b7e..3fad5e194ec 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/languageModels/typesystem.mps
@@ -70,7 +70,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -82,6 +82,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -164,7 +165,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -176,7 +177,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -401,7 +401,7 @@
                   <node concept="3clFbF" id="3el1Vh3VSUP" role="3cqZAp">
                     <node concept="2OqwBi" id="3el1Vh3VSUQ" role="3clFbG">
                       <node concept="37vLTw" id="3el1Vh3VSUR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3el1Vh3VSUU" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1zG" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="3el1Vh3VSUS" role="2OqNvi">
                         <node concept="chp4Y" id="3el1Vh3VSUT" role="cj9EA">
@@ -411,9 +411,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3el1Vh3VSUU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1zG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3el1Vh3VSUV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1zH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -435,13 +435,13 @@
                         <property role="Xl_RC" value="only one default allowed" />
                       </node>
                       <node concept="37vLTw" id="3el1Vh3VSWU" role="1urrMF">
-                        <ref role="3cqZAo" node="3el1Vh3VSWR" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1zI" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3el1Vh3VSWR" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1zI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3el1Vh3VSWS" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1zJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -604,7 +604,7 @@
                                   <node concept="2OqwBi" id="79i$vAY7jcw" role="2Oq$k0">
                                     <node concept="2yIwOk" id="79i$vAY7jcx" role="2OqNvi" />
                                     <node concept="37vLTw" id="3PC_f$W7Zws" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7H6_Qip6e8Z" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1zK" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3O6GUB" id="79i$vAY7jcy" role="2OqNvi">
@@ -617,7 +617,7 @@
                                   <node concept="2OqwBi" id="79i$vAY7jc_" role="2Oq$k0">
                                     <node concept="2yIwOk" id="79i$vAY7jcA" role="2OqNvi" />
                                     <node concept="37vLTw" id="3PC_f$W7Zwx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7H6_Qip6e8Z" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1zK" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3O6GUB" id="79i$vAY7jcB" role="2OqNvi">
@@ -631,7 +631,7 @@
                                 <node concept="2OqwBi" id="79i$vAY7jcE" role="2Oq$k0">
                                   <node concept="2yIwOk" id="79i$vAY7jcF" role="2OqNvi" />
                                   <node concept="37vLTw" id="3PC_f$W7ZwA" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7H6_Qip6e8Z" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1zK" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3O6GUB" id="79i$vAY7jcG" role="2OqNvi">
@@ -645,7 +645,7 @@
                               <node concept="2OqwBi" id="79i$vAY7jcJ" role="2Oq$k0">
                                 <node concept="2yIwOk" id="79i$vAY7jcK" role="2OqNvi" />
                                 <node concept="37vLTw" id="3PC_f$W7ZwF" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7H6_Qip6e8Z" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1zK" resolve="it" />
                                 </node>
                               </node>
                               <node concept="3O6GUB" id="79i$vAY7jcL" role="2OqNvi">
@@ -659,7 +659,7 @@
                             <node concept="2OqwBi" id="79i$vAY7jcO" role="2Oq$k0">
                               <node concept="2yIwOk" id="79i$vAY7jcP" role="2OqNvi" />
                               <node concept="37vLTw" id="3PC_f$W7ZwL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7H6_Qip6e8Z" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1zK" resolve="it" />
                               </node>
                             </node>
                             <node concept="3O6GUB" id="79i$vAY7jcQ" role="2OqNvi">
@@ -673,9 +673,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7H6_Qip6e8Z" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1zK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7H6_Qip6e90" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1zL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -688,13 +688,13 @@
                     <property role="Xl_RC" value="not allowed in this context" />
                   </node>
                   <node concept="37vLTw" id="7H6_Qip6eel" role="1urrMF">
-                    <ref role="3cqZAo" node="7H6_Qip6edL" resolve="it" />
+                    <ref role="3cqZAo" node="2SR9xrsN1zM" resolve="it" />
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="7H6_Qip6edL" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1zM" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="7H6_Qip6edM" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1zN" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl
index b14400cf7a0..dcc78e773c6 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl
@@ -49,7 +49,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -116,7 +116,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -150,7 +149,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -165,7 +163,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd
index 0e8a914cb33..fcc599b93c6 100644
--- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd
+++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.requirements.c.interpreter" uuid="cda16396-640d-48e1-9f3b-60687a3cd661" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.cc.requirements.c.interpreter" uuid="cda16396-640d-48e1-9f3b-60687a3cd661" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">c4707a9d-e0c7-4c73-a63d-5f38d8a4ebc9(com.mbeddr.core.util.interpreter)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/models/plugin.mps b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/models/plugin.mps
index 9a28bcec3ea..376167d007b 100644
--- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -90,7 +90,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -187,7 +187,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd
index d45cebccca7..7560f421ad1 100644
--- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd
+++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.var.annotations.interpreter" uuid="94410653-797e-41ca-9490-0385b363b095" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.cc.var.annotations.interpreter" uuid="94410653-797e-41ca-9490-0385b363b095" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">017fba0e-af15-4a23-b0a8-02b5c1141e75(com.mbeddr.cc.var.annotations)</dependency>
@@ -19,7 +18,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/models/plugin.mps b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/models/plugin.mps
index aca4c7d2832..22f15994236 100644
--- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/models/plugin.mps
@@ -46,7 +46,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd
index 2ed556ca78c..0413c881422 100644
--- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd
+++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.cc.var.fm.interpreter" uuid="e2dec943-a062-4039-b9d8-d805f990e6ca" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.cc.var.fm.interpreter" uuid="e2dec943-a062-4039-b9d8-d805f990e6ca" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">e401b447-8019-4ccd-a72c-bfb0230f5782(com.mbeddr.cc.var.fm)</dependency>
@@ -19,7 +18,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/models/plugin.mps b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/models/plugin.mps
index 8ce01d7f7f8..ae5474382ba 100644
--- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/models/plugin.mps
@@ -38,7 +38,7 @@
       <concept id="8511326569641529826" name="com.mbeddr.mpsutil.interpreter.structure.ConditionalConceptEvaluator" flags="ng" index="3SNpY9" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd
index 8ede2feb8aa..b4210495da2 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.cc.fm" uuid="1c56e460-be33-4f73-b77e-7dbe2b90b546" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.cc.fm" uuid="1c56e460-be33-4f73-b77e-7dbe2b90b546" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="." />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:e865cad2-7cc8-437a-951a-665bcbcb8b1a:com.mbeddr.cc.requirements" version="0" />
     <language slang="l:983e02f8-8062-426e-b60d-bc044a46b93a:com.mbeddr.cc.requirements.report" version="0" />
@@ -51,7 +50,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm.mps
index 60db4de71b1..9158f965d97 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm.mps
@@ -47,7 +47,7 @@
         <property id="5952395988556102274" name="supportsSharedLibraries" index="uKT8v" />
       </concept>
       <concept id="5476261277774416029" name="com.mbeddr.core.buildconfig.structure.Win32" flags="ng" index="1l1LS3" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -86,7 +86,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -98,7 +98,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -106,7 +106,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -207,7 +207,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -222,7 +222,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm/dummy@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm/dummy@tests.mps
index af050cd2119..676ae30415b 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm/dummy@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/fm/dummy@tests.mps
@@ -18,7 +18,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/secondExample.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/secondExample.mps
index ee38ba55278..b1d2bd602df 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/secondExample.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/secondExample.mps
@@ -9,7 +9,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -73,10 +73,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -84,7 +84,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -150,7 +150,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_debug.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_debug.mps
index d8b65a4d7e6..768de1d74e3 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_debug.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_debug.mps
@@ -34,7 +34,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -45,7 +45,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_production.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_production.mps
index 5b3e38f6027..6999dd119e5 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_production.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/test/ex/cc/v_production.mps
@@ -34,7 +34,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -45,7 +45,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd
index d0ed35ee6db..84852a4b4d2 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.cc.fmrt" uuid="a151b91b-cb79-47fa-bb82-2e83ba393144" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.cc.fmrt" uuid="a151b91b-cb79-47fa-bb82-2e83ba393144" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:e401b447-8019-4ccd-a72c-bfb0230f5782:com.mbeddr.cc.var.fm" version="1" />
     <language slang="l:b8eeb935-038d-48d8-ae7f-0c6768b8d4fc:com.mbeddr.cc.var.rt" version="0" />
@@ -43,7 +42,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/dummy@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/dummy@tests.mps
index 897579ed9e1..13676e13c76 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/dummy@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/dummy@tests.mps
@@ -18,7 +18,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/fm.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/fm.mps
index aaa89eebc93..9670d36a88c 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/fm.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/models/test/ex/cc/fmrt/fm.mps
@@ -47,7 +47,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -58,7 +58,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -72,7 +72,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -126,7 +126,7 @@
       <concept id="6825476687691317627" name="com.mbeddr.cc.var.fm.structure.OptionalConstraint" flags="ng" index="Idvup" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -135,7 +135,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -156,7 +156,7 @@
         <reference id="8000796061689964158" name="attr" index="2AlQZu" />
         <child id="8000796061689964157" name="context" index="2AlQZt" />
       </concept>
-      <concept id="8000796061690156840" name="com.mbeddr.cc.var.rt.structure.IConfigModelSelector" flags="ng" index="2Aq_U8">
+      <concept id="8000796061690156840" name="com.mbeddr.cc.var.rt.structure.IConfigModelSelector" flags="ngI" index="2Aq_U8">
         <reference id="8000796061690159789" name="rtFeatureModel" index="2AqAGd" />
         <reference id="8000796061690159814" name="configModel" index="2AqAHA" />
       </concept>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd
index ad8ffb01e83..c0c1316a1dd 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.cc.requirements.c" uuid="573b21f7-42a0-49fb-9b0f-c30c63a6ba81" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.cc.requirements.c" uuid="573b21f7-42a0-49fb-9b0f-c30c63a6ba81" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:e865cad2-7cc8-437a-951a-665bcbcb8b1a:com.mbeddr.cc.requirements" version="0" />
     <language slang="l:f3ed62ca-3490-40d0-890b-9b3133cc2ead:com.mbeddr.cc.requirements.c" version="0" />
@@ -35,7 +34,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/models/test/ex/cc/requirements/c/reqc@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/models/test/ex/cc/requirements/c/reqc@tests.mps
index 5330fa4e7b2..696ea0aa3d5 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/models/test/ex/cc/requirements/c/reqc@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/models/test/ex/cc/requirements/c/reqc@tests.mps
@@ -56,12 +56,12 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136472795" name="com.mbeddr.doc.structure.PathDefinition" flags="ng" index="2SbYGw">
@@ -74,7 +74,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
     </language>
@@ -96,7 +96,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -110,7 +110,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -118,7 +118,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -177,7 +177,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -187,7 +187,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/models/test/ex/cc/var/alternative/main.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/models/test/ex/cc/var/alternative/main.mps
index 3b2c153384e..9215768db2b 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/models/test/ex/cc/var/alternative/main.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/models/test/ex/cc/var/alternative/main.mps
@@ -36,7 +36,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -47,7 +47,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -60,7 +60,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -142,7 +142,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -151,7 +151,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd
index 5b0bdc5eca5..b6f7d227638 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.cc.var.alternative" uuid="91d26cfd-77e5-40da-a30d-4db09a404519" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.cc.var.alternative" uuid="91d26cfd-77e5-40da-a30d-4db09a404519" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:017fba0e-af15-4a23-b0a8-02b5c1141e75:com.mbeddr.cc.var.annotations" version="0" />
     <language slang="l:634736cf-ea73-4eb1-abe9-d2ecc5fcf837:com.mbeddr.cc.var.c" version="0" />
@@ -44,7 +43,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd
index 0b4f07533a8..d4959e1297e 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.cc.var.c" uuid="22b52a4a-182e-4fa0-87fe-af2cf70d2873" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.cc.var.c" uuid="22b52a4a-182e-4fa0-87fe-af2cf70d2873" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:017fba0e-af15-4a23-b0a8-02b5c1141e75:com.mbeddr.cc.var.annotations" version="0" />
     <language slang="l:634736cf-ea73-4eb1-abe9-d2ecc5fcf837:com.mbeddr.cc.var.c" version="0" />
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/application.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/application.mps
index bc6e3bc3cff..cb3d3c8cbb6 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/application.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/application.mps
@@ -47,7 +47,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -60,7 +60,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -132,12 +132,12 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="634736cf-ea73-4eb1-abe9-d2ecc5fcf837" name="com.mbeddr.cc.var.c">
-      <concept id="5959167564566749003" name="com.mbeddr.cc.var.c.structure.IVariantAware" flags="ng" index="3xHewo">
+      <concept id="5959167564566749003" name="com.mbeddr.cc.var.c.structure.IVariantAware" flags="ngI" index="3xHewo">
         <child id="5959167564566749552" name="conditions" index="3xHdoz" />
       </concept>
       <concept id="5959167564566749004" name="com.mbeddr.cc.var.c.structure.VariantAwareType" flags="ng" index="3xHewv">
@@ -157,7 +157,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/dummy@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/dummy@tests.mps
index 83f2d46b2ea..a5686e53b7a 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/dummy@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/dummy@tests.mps
@@ -18,7 +18,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/float_variant.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/float_variant.mps
index afb3a88018f..bdd5dc24f06 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/float_variant.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/float_variant.mps
@@ -34,7 +34,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -45,7 +45,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -59,7 +59,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -84,7 +84,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/int_variant.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/int_variant.mps
index 9a90dbbdf7a..8509bb9fa21 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/int_variant.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/models/test/ex/cc/var/c/int_variant.mps
@@ -34,7 +34,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -45,7 +45,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -59,7 +59,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -84,7 +84,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/models/test/ex/cc/var/composition/test1.mps b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/models/test/ex/cc/var/composition/test1.mps
index 91a8797dabc..c6ad1db18bb 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/models/test/ex/cc/var/composition/test1.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/models/test/ex/cc/var/composition/test1.mps
@@ -84,7 +84,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -133,7 +133,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -144,7 +144,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -152,7 +152,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -190,7 +190,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -201,7 +201,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd
index 8f7135b4476..d6c543bfd04 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.cc.var.composition" uuid="17ce2227-d454-4d7c-8840-687f90105cf6" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.cc.var.composition" uuid="17ce2227-d454-4d7c-8840-687f90105cf6" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:21ac77a4-1b66-44c5-aaec-94e43bb86519:com.mbeddr.cc.var.composition" version="0" />
     <language slang="l:03f78d94-3f33-4789-ad35-5950b32fdad8:com.mbeddr.cc.var.composition.c" version="0" />
@@ -42,7 +41,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/models/test/ex/requirements/report/dummy@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/models/test/ex/requirements/report/dummy@tests.mps
index 06a79fc1c09..3122997ad03 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/models/test/ex/requirements/report/dummy@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/models/test/ex/requirements/report/dummy@tests.mps
@@ -18,7 +18,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/test.ex.requirements.report.msd b/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/test.ex.requirements.report.msd
index 3145e03bea9..53ca592b632 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/test.ex.requirements.report.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ex.requirements.report/test.ex.requirements.report.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.requirements.report" uuid="ae637d88-c438-4b4f-80e2-a679347cb571" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.requirements.report" uuid="ae637d88-c438-4b4f-80e2-a679347cb571" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/code.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/code.mps
index ca8d2d59ce6..0b6217eab01 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/code.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/code.mps
@@ -17,7 +17,7 @@
   </imports>
   <registry>
     <language id="53bab999-e9c3-428a-80be-fef5bed08f55" name="com.mbeddr.cc.trace">
-      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ng" index="FamN3">
+      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ngI" index="FamN3">
         <child id="4577779292081946445" name="refs" index="Fanle" />
         <child id="4577779292081946444" name="tracekind" index="Fanlf" />
       </concept>
@@ -36,7 +36,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -80,7 +80,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -95,7 +95,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -110,7 +110,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -118,7 +118,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -141,7 +141,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -155,7 +155,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps
index be406fd407c..cac6bb57488 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps
@@ -31,7 +31,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
     </language>
@@ -78,7 +78,7 @@
       <concept id="1165432222362123724" name="com.mbeddr.cc.requirements.structure.RefinesLink" flags="ng" index="1BB4Yy" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd
index c9ae0d92a2e..c0c391f00c3 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.requirements" uuid="7466d292-a28b-4345-a8e6-6b8b334ce6ca" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.requirements" uuid="7466d292-a28b-4345-a8e6-6b8b334ce6ca" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -12,7 +12,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -59,7 +58,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <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" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/code_and_reqs.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/code_and_reqs.mps
index ea49eb6e28f..f75d3b65e1a 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/code_and_reqs.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/code_and_reqs.mps
@@ -11,7 +11,7 @@
   <imports />
   <registry>
     <language id="53bab999-e9c3-428a-80be-fef5bed08f55" name="com.mbeddr.cc.trace">
-      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ng" index="FamN3">
+      <concept id="4577779292081940160" name="com.mbeddr.cc.trace.structure.ITrace" flags="ngI" index="FamN3">
         <child id="4577779292081946445" name="refs" index="Fanle" />
         <child id="4577779292081946444" name="tracekind" index="Fanlf" />
       </concept>
@@ -60,12 +60,12 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136472795" name="com.mbeddr.doc.structure.PathDefinition" flags="ng" index="2SbYGw">
@@ -78,7 +78,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
     </language>
@@ -107,7 +107,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -123,7 +123,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -158,7 +158,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -167,7 +167,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/interperter@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/interperter@tests.mps
index b980e9f709c..672bbbd3dc0 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/interperter@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/test/ts/requirements/interperter@tests.mps
@@ -8,7 +8,7 @@
     <use id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc" version="4" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -136,7 +136,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -153,7 +153,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -188,7 +188,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -202,6 +202,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -217,13 +218,13 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -250,7 +251,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -277,7 +278,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -303,7 +304,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
@@ -324,7 +325,6 @@
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
         <child id="1225711182005" name="list" index="1y566C" />
         <child id="1225711191269" name="index" index="1y58nS" />
@@ -2169,7 +2169,7 @@
                     <node concept="3clFbF" id="2BbcAuIkbm7" role="3cqZAp">
                       <node concept="2OqwBi" id="2BbcAuIkbm8" role="3clFbG">
                         <node concept="37vLTw" id="2BbcAuIkbm9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2BbcAuIkbmb" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2$8" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2BbcAuIkbma" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2177,9 +2177,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2BbcAuIkbmb" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2$8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2BbcAuIkbmc" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2$9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd
index 6149ca3c022..05684917c3f 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.cc.var.c" uuid="7155c081-a292-4e73-b275-f5d60082f861" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.cc.var.c" uuid="7155c081-a292-4e73-b275-f5d60082f861" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
   </dependencies>
@@ -35,7 +34,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -89,7 +88,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="7155c081-a292-4e73-b275-f5d60082f861(test.ts.cc.var.c)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps
index 75a116340c9..b276d1a823f 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps
@@ -65,7 +65,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -78,7 +78,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -92,7 +92,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -165,12 +165,12 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="634736cf-ea73-4eb1-abe9-d2ecc5fcf837" name="com.mbeddr.cc.var.c">
-      <concept id="5959167564566749003" name="com.mbeddr.cc.var.c.structure.IVariantAware" flags="ng" index="3xHewo">
+      <concept id="5959167564566749003" name="com.mbeddr.cc.var.c.structure.IVariantAware" flags="ngI" index="3xHewo">
         <child id="5959167564566749552" name="conditions" index="3xHdoz" />
       </concept>
       <concept id="5959167564566749004" name="com.mbeddr.cc.var.c.structure.VariantAwareType" flags="ng" index="3xHewv">
@@ -187,7 +187,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/models/test1@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/models/test1@tests.mps
index 92d1c8bda9b..55f89d8ec19 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/models/test1@tests.mps
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/models/test1@tests.mps
@@ -59,7 +59,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774416029" name="com.mbeddr.core.buildconfig.structure.Win32" flags="ng" index="1l1LS3" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -83,7 +83,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -91,14 +91,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -111,7 +111,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -123,7 +123,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128058" name="com.mbeddr.core.expressions.structure.BooleanType" flags="ng" index="3TlMgk" />
diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd
index 54fc355cd83..0e7a56ed63e 100644
--- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd
+++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.cc.var.composition" uuid="02934d30-d149-4f7d-864e-7f376629ae8f" moduleVersion="0" compileInMPS="true">
+<solution name="test.ts.cc.var.composition" uuid="02934d30-d149-4f7d-864e-7f376629ae8f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">03f78d94-3f33-4789-ad35-5950b32fdad8(com.mbeddr.cc.var.composition.c)</dependency>
   </dependencies>
@@ -50,7 +49,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/.mps/migration.xml b/code/languages/com.mbeddr.core/.mps/migration.xml
index 273d8e8a3ee..65112394c89 100644
--- a/code/languages/com.mbeddr.core/.mps/migration.xml
+++ b/code/languages/com.mbeddr.core/.mps/migration.xml
@@ -20,6 +20,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -28,6 +30,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd
index 3a420e43721..ca0836e23bd 100644
--- a/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.core.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.core.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.core.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/models/com/mbeddr/core/__spreferences/PlatformTemplates.mps b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/models/com/mbeddr/core/__spreferences/PlatformTemplates.mps
index 5cd6d5defb3..e4672dcb9b3 100644
--- a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/models/com/mbeddr/core/__spreferences/PlatformTemplates.mps
+++ b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/models/com/mbeddr/core/__spreferences/PlatformTemplates.mps
@@ -22,12 +22,12 @@
         <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd
index 21fb7e10ba9..6db7806c84c 100644
--- a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd
+++ b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.core.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd
index d34649ff4bf..e17ad1b7362 100644
--- a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.core.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.core.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.core.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl
index e96563449f8..406b4b20788 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl
@@ -39,7 +39,7 @@
         <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -115,7 +115,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -135,7 +134,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -157,7 +156,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -213,7 +212,6 @@
     <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="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <runtime>
     <dependency reexport="false">984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)</dependency>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps
index 11a5eeed0e9..0f60ae4eaf6 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps
@@ -54,13 +54,13 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
     </language>
@@ -147,7 +147,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageAccessories/com/mbeddr/core/pointers/utils.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageAccessories/com/mbeddr/core/pointers/utils.mps
index faaff516498..3fd9bee0199 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageAccessories/com/mbeddr/core/pointers/utils.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageAccessories/com/mbeddr/core/pointers/utils.mps
@@ -63,7 +63,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,7 +78,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -131,7 +131,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/constraints.mps
index 7e2d8fe01c0..02e0cbd3057 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/constraints.mps
@@ -38,7 +38,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps
index 72c7d8a12ca..59362e9f455 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps
@@ -40,7 +40,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -64,7 +64,7 @@
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
@@ -101,10 +101,10 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -131,7 +131,7 @@
       </concept>
       <concept id="1139535439104" name="jetbrains.mps.lang.editor.structure.CellActionMap_ExecuteFunction" flags="in" index="1hAIg9" />
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3308396621974588243" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_Contribution" flags="ng" index="3p309x">
@@ -154,18 +154,18 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
         <reference id="843003353410421234" name="concept" index="1FNNbB" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="3647146066980922272" name="jetbrains.mps.lang.editor.structure.SelectInEditorOperation" flags="nn" index="1OKiuA">
@@ -192,7 +192,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -263,7 +263,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -279,7 +279,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -369,7 +369,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/intentions.mps
index 7f862075b2f..09a8f83edc7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/intentions.mps
@@ -36,7 +36,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -77,7 +77,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/plugin.mps
index 153beb9010d..f0bc366a0bd 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:62fa0cc1-0a94-41cf-95db-5a63aba38f91(com.mbeddr.core.pointers.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/typesystem.mps
index 353b9a2cbff..c730fa4b4f5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/typesystem.mps
@@ -150,7 +150,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -172,7 +172,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -200,6 +200,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -391,7 +392,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -442,7 +443,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
@@ -1103,7 +1103,7 @@
                                       <node concept="3clFbF" id="6ucVliiGPa6" role="3cqZAp">
                                         <node concept="2OqwBi" id="6ucVliiGPfb" role="3clFbG">
                                           <node concept="37vLTw" id="6ucVliiGPa5" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6ucVliiGOUa" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1zV" resolve="it" />
                                           </node>
                                           <node concept="2qgKlT" id="6ucVliiGPKn" role="2OqNvi">
                                             <ref role="37wK5l" to="hwgx:6ucVliiGyWC" resolve="isSuppressionAllowed" />
@@ -1111,9 +1111,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6ucVliiGOUa" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1zV" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6ucVliiGOUb" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1zW" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3057,13 +3057,13 @@
                   <node concept="3clFbF" id="2nH2HpRnHoY" role="3cqZAp">
                     <node concept="37vLTI" id="2nH2HpRnHpd" role="3clFbG">
                       <node concept="37vLTw" id="2nH2HpRnHpg" role="37vLTx">
-                        <ref role="3cqZAo" node="2nH2HpRnHoW" resolve="ref" />
+                        <ref role="3cqZAo" node="2SR9xrsN1zX" resolve="ref" />
                       </node>
                       <node concept="3EllGN" id="2nH2HpRnHp4" role="37vLTJ">
                         <node concept="2OqwBi" id="79i$vAY5OOC" role="3ElVtu">
                           <node concept="CsP83" id="79i$vAY5OOD" role="2OqNvi" />
                           <node concept="37vLTw" id="79i$vAY5OOE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2nH2HpRnHoW" resolve="ref" />
+                            <ref role="3cqZAo" node="2SR9xrsN1zX" resolve="ref" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="2nH2HpRnHoZ" role="3ElQJh">
@@ -3073,9 +3073,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2nH2HpRnHoW" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1zX" role="1bW2Oz">
                   <property role="TrG5h" value="ref" />
-                  <node concept="2jxLKc" id="5BnVI5kFmy0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1zY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3095,13 +3095,13 @@
                   <node concept="3clFbF" id="2nH2HpRnHpp" role="3cqZAp">
                     <node concept="37vLTI" id="2nH2HpRnHpq" role="3clFbG">
                       <node concept="37vLTw" id="2nH2HpRnHpr" role="37vLTx">
-                        <ref role="3cqZAo" node="2nH2HpRnHpx" resolve="ref" />
+                        <ref role="3cqZAo" node="2SR9xrsN1zZ" resolve="ref" />
                       </node>
                       <node concept="3EllGN" id="2nH2HpRnHps" role="37vLTJ">
                         <node concept="2OqwBi" id="79i$vAY5OOH" role="3ElVtu">
                           <node concept="CsP83" id="79i$vAY5OOI" role="2OqNvi" />
                           <node concept="37vLTw" id="79i$vAY5OOJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2nH2HpRnHpx" resolve="ref" />
+                            <ref role="3cqZAo" node="2SR9xrsN1zZ" resolve="ref" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="2nH2HpRnHp$" role="3ElQJh">
@@ -3111,9 +3111,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2nH2HpRnHpx" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1zZ" role="1bW2Oz">
                   <property role="TrG5h" value="ref" />
-                  <node concept="2jxLKc" id="5BnVI5kFmyf" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1$0" role="1tU5fm" />
                 </node>
               </node>
             </node>
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 2bed04b7385..265ed4b6de1 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
@@ -32,7 +32,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -84,7 +84,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -108,6 +107,7 @@
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
     <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
     <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
+    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -126,7 +126,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -156,7 +156,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
@@ -217,7 +217,6 @@
     <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="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/com/mbeddr/core/base/generator/template/util.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/com/mbeddr/core/base/generator/template/util.mps
index 1790be5a48e..a7dd0cf593a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/com/mbeddr/core/base/generator/template/util.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/com/mbeddr/core/base/generator/template/util.mps
@@ -52,7 +52,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -60,12 +60,13 @@
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -78,7 +79,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -97,7 +98,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -130,7 +130,7 @@
                       <node concept="2OqwBi" id="94IdDKwz4k" role="3fr31v">
                         <node concept="2OqwBi" id="94IdDKwz4l" role="2Oq$k0">
                           <node concept="37vLTw" id="94IdDKwz4m" role="2Oq$k0">
-                            <ref role="3cqZAo" node="94IdDKwvRf" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1AF" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="94IdDKwz4n" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -143,9 +143,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="94IdDKwvRf" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1AF" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="94IdDKwvRg" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1AG" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -201,7 +201,7 @@
                       <node concept="3clFbF" id="94IdDKwCnZ" role="3cqZAp">
                         <node concept="2OqwBi" id="94IdDKwCsC" role="3clFbG">
                           <node concept="37vLTw" id="94IdDKwCnY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="94IdDKwCbX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1AH" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="94IdDKwCUi" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6clJcrKt_a0" resolve="isReexported" />
@@ -209,9 +209,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="94IdDKwCbX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1AH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="94IdDKwCbY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1AI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -286,7 +286,7 @@
                           <node concept="2OqwBi" id="94IdDKxr9q" role="3clFbG">
                             <node concept="2OqwBi" id="94IdDKxr9r" role="2Oq$k0">
                               <node concept="37vLTw" id="94IdDKxr9s" role="2Oq$k0">
-                                <ref role="3cqZAo" node="94IdDKxr9v" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1AJ" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="94IdDKxr9t" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -298,9 +298,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="94IdDKxr9v" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1AJ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="94IdDKxr9w" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1AK" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -353,7 +353,7 @@
                       <node concept="2OqwBi" id="94IdDKxfql" role="3fr31v">
                         <node concept="2OqwBi" id="94IdDKxfqm" role="2Oq$k0">
                           <node concept="37vLTw" id="94IdDKxfqn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="94IdDKxfqq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1AL" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="94IdDKxfqo" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -366,9 +366,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="94IdDKxfqq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1AL" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="94IdDKxfqr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1AM" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/main@generator.mps
index 02b648d2953..cfac511c669 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/generator/template/main@generator.mps
@@ -63,7 +63,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,6 +112,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -146,7 +147,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -174,7 +175,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -250,7 +250,7 @@
                       <node concept="3clFbF" id="3RsvcbxQwnE" role="3cqZAp">
                         <node concept="2OqwBi" id="3RsvcbxQwzR" role="3clFbG">
                           <node concept="37vLTw" id="3RsvcbxQwnD" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3RsvcbxQwas" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1At" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="3RsvcbxQxYb" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:7Vd878ENIh6" resolve="isImplementationArtifact" />
@@ -258,9 +258,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3RsvcbxQwas" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1At" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3RsvcbxQwat" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Au" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -272,7 +272,7 @@
                       <node concept="2OqwBi" id="3RsvcbxQDwQ" role="3clFbG">
                         <node concept="2OqwBi" id="3RsvcbxQA4f" role="2Oq$k0">
                           <node concept="37vLTw" id="3RsvcbxQ_Qt" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3RsvcbxQ_$Y" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Ax" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="3RsvcbxQCTL" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6clJcrJYPM5" resolve="dependencies" />
@@ -285,7 +285,7 @@
                                 <node concept="3fqX7Q" id="3Rsvcbyxvpo" role="3clFbG">
                                   <node concept="2OqwBi" id="3Rsvcbyxvpq" role="3fr31v">
                                     <node concept="37vLTw" id="3Rsvcbyxvpr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3RsvcbxQOq$" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Av" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="3Rsvcbyxvps" role="2OqNvi">
                                       <ref role="37wK5l" to="hwgx:3RsvcbxQJ_g" resolve="importsImplementationChunk" />
@@ -294,18 +294,18 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3RsvcbxQOq$" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Av" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3RsvcbxQOq_" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Aw" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3RsvcbxQ_$Y" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ax" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3RsvcbxQ_$Z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ay" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -316,15 +316,15 @@
                   <node concept="3clFbF" id="3RsvcbxQSZP" role="3cqZAp">
                     <node concept="2OqwBi" id="3RsvcbxQTd7" role="3clFbG">
                       <node concept="37vLTw" id="3RsvcbxQSZO" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3RsvcbxQSWZ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Az" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="3RsvcbxQUJL" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3RsvcbxQSWZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Az" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3RsvcbxQSX0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1A$" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -365,7 +365,7 @@
                       <node concept="3fqX7Q" id="3RsvcbxQWGY" role="3clFbG">
                         <node concept="2OqwBi" id="3RsvcbxQWH0" role="3fr31v">
                           <node concept="37vLTw" id="3RsvcbxQWH1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3RsvcbxQWlJ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1A_" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="3RsvcbxQWH2" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:7Vd878ENIh6" resolve="isImplementationArtifact" />
@@ -374,9 +374,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3RsvcbxQWlJ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1A_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3RsvcbxQWlK" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1AA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -387,15 +387,15 @@
                   <node concept="3clFbF" id="3RsvcbxQYUA" role="3cqZAp">
                     <node concept="2OqwBi" id="3RsvcbxQZ6N" role="3clFbG">
                       <node concept="37vLTw" id="3RsvcbxQYU_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3RsvcbxQYRM" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1AB" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="3RsvcbxR0CK" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3RsvcbxQYRM" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1AB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3RsvcbxQYRN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1AC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -596,7 +596,7 @@
                     <node concept="3clFbF" id="94IdDKwpan" role="3cqZAp">
                       <node concept="2OqwBi" id="94IdDKwpao" role="3clFbG">
                         <node concept="37vLTw" id="94IdDKwpap" role="2Oq$k0">
-                          <ref role="3cqZAo" node="94IdDKwpar" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1AD" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="94IdDKwpaq" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:7Vd878ENIh6" resolve="isImplementationArtifact" />
@@ -604,9 +604,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="94IdDKwpar" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1AD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="94IdDKwpas" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1AE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index 621c4401012..446e42ef6ee 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -9,7 +9,7 @@
     <use id="d2a1d976-43a2-462f-ac3a-9b258ced839d" name="com.mbeddr.mpsutil.multilingual.baseLanguage" version="-1" />
     <use id="23f985f2-965f-4af1-aee8-a32677429514" name="com.mbeddr.mpsutil.multilingual.common" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -68,6 +68,7 @@
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
+    <import index="z1c5" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
@@ -371,6 +372,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -606,7 +608,6 @@
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -1073,6 +1074,27 @@
       <node concept="3Tqbb2" id="4ueXZrqtN13" role="3clF45" />
       <node concept="3Tm1VV" id="4ueXZrqtN14" role="1B3o_S" />
     </node>
+    <node concept="13i0hz" id="4jmgM1fTGW8" role="13h7CS">
+      <property role="TrG5h" value="getTextualRepresentation" />
+      <ref role="13i0hy" to="tpcu:fB3l80ylIb" resolve="getTextualRepresentation" />
+      <node concept="3Tm1VV" id="4jmgM1fTGW9" role="1B3o_S" />
+      <node concept="3clFbS" id="4jmgM1fTGWc" role="3clF47">
+        <node concept="3clFbF" id="4jmgM1fTGWf" role="3cqZAp">
+          <node concept="2OqwBi" id="4jmgM1fTMwR" role="3clFbG">
+            <node concept="2OqwBi" id="4jmgM1fTLPE" role="2Oq$k0">
+              <node concept="13iPFW" id="4jmgM1fTLxc" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4jmgM1fTMjx" role="2OqNvi">
+                <ref role="3Tt5mk" to="vs0r:3wX8xlocnjN" resolve="text" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="4jmgM1fTMKI" role="2OqNvi">
+              <ref role="37wK5l" node="6byLOcR3jNg" resolve="asTextString" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="4jmgM1fTGWd" role="3clF45" />
+    </node>
     <node concept="13i0hz" id="4ueXZrqtwBY" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
@@ -1375,7 +1397,7 @@
                   <node concept="3clFbF" id="_ayoHGBWdP" role="3cqZAp">
                     <node concept="2OqwBi" id="_ayoHGBWhF" role="3clFbG">
                       <node concept="37vLTw" id="_ayoHGBWdN" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3R$6B6bL1DW" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1$B" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="_ayoHGBWte" role="2OqNvi">
                         <node concept="25Kdxt" id="_ayoHGBWx4" role="cj9EA">
@@ -1390,9 +1412,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3R$6B6bL1DW" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1$B" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3R$6B6bL1DX" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1$C" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2135,7 +2157,7 @@
                           <node concept="17QB3L" id="jpyKDg2iih" role="1tU5fm" />
                           <node concept="2OqwBi" id="jpyKDg2iii" role="33vP2m">
                             <node concept="37vLTw" id="jpyKDg2iij" role="2Oq$k0">
-                              <ref role="3cqZAo" node="jpyKDg1A93" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1$D" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="jpyKDg2iik" role="2OqNvi">
                               <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -2172,9 +2194,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="jpyKDg1A93" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1$D" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="jpyKDg1A94" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1$E" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2589,7 +2611,7 @@
                   <node concept="3clFbF" id="7hIyKqbGtqL" role="3cqZAp">
                     <node concept="2OqwBi" id="7hIyKqbGtr7" role="3clFbG">
                       <node concept="37vLTw" id="7hIyKqbGtqM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7hIyKqbGtqJ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1$F" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="2mxBqlhBQtp" role="2OqNvi">
                         <ref role="3TsBF5" to="vs0r:2mxBqlhBlA8" resolve="isNew" />
@@ -2597,9 +2619,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7hIyKqbGtqJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1$F" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7hIyKqbGtqK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1$G" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2642,7 +2664,7 @@
                         <node concept="3clFbF" id="5Ju6x2OROD3" role="3cqZAp">
                           <node concept="2OqwBi" id="5Ju6x2ORODp" role="3clFbG">
                             <node concept="37vLTw" id="5Ju6x2OROD4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5Ju6x2OROD1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1$H" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5Ju6x2ORODv" role="2OqNvi">
                               <ref role="37wK5l" node="7hIyKqbGtjy" resolve="hasIdentifier" />
@@ -2663,9 +2685,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5Ju6x2OROD1" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$H" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5Ju6x2OROD2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$I" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2724,7 +2746,7 @@
                           <node concept="2OqwBi" id="7hIyKqbGtmm" role="3clFbG">
                             <node concept="2OqwBi" id="7hIyKqbGtmn" role="2Oq$k0">
                               <node concept="37vLTw" id="7hIyKqbGtmo" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7hIyKqbGtmu" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1$J" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="7hIyKqbGtmp" role="2OqNvi">
                                 <ref role="3Tt5mk" to="vs0r:K292flwHwj" resolve="result" />
@@ -2744,9 +2766,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7hIyKqbGtmu" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$J" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7hIyKqbGtmv" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$K" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2942,7 +2964,7 @@
                     <node concept="3clFbF" id="26F1Swiao2N" role="3cqZAp">
                       <node concept="2OqwBi" id="26F1Swiao39" role="3clFbG">
                         <node concept="37vLTw" id="26F1Swiao2O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="26F1Swiao2L" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1$L" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="26F1Swiao3f" role="2OqNvi">
                           <ref role="37wK5l" node="26F1Swi9tri" resolve="beginsGroup" />
@@ -2950,9 +2972,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="26F1Swiao2L" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1$L" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="26F1Swiao2M" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1$M" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3008,7 +3030,7 @@
                           <node concept="3clFbF" id="7yuakSiMvGS" role="3cqZAp">
                             <node concept="2OqwBi" id="7yuakSiMvGT" role="3clFbG">
                               <node concept="37vLTw" id="7yuakSiMvGU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7yuakSiMvGW" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1$N" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="3greo4NDWfa" role="2OqNvi">
                                 <ref role="37wK5l" node="3greo4NDQMb" resolve="sortKey" />
@@ -3016,9 +3038,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7yuakSiMvGW" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1$N" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7yuakSiMvGX" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1$O" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="1nlBCl" id="7yuakSiMvGY" role="2S7zOq">
@@ -3269,7 +3291,7 @@
                       <node concept="3clFbF" id="7sHl0myfjmu" role="3cqZAp">
                         <node concept="2OqwBi" id="7sHl0myfjmw" role="3clFbG">
                           <node concept="37vLTw" id="7sHl0myfjmx" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7sHl0myfjlX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$P" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2mxBqlhBPwf" role="2OqNvi">
                             <ref role="3TsBF5" to="vs0r:2mxBqlhBlA8" resolve="isNew" />
@@ -3277,9 +3299,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7sHl0myfjlX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1$P" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7sHl0myfjm_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1$Q" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3314,7 +3336,7 @@
                       <node concept="3clFbF" id="7sHl0myfjmO" role="3cqZAp">
                         <node concept="2OqwBi" id="7sHl0myfjmQ" role="3clFbG">
                           <node concept="37vLTw" id="7sHl0myfjmR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7sHl0myfjlY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$R" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2mxBqlhBOnS" role="2OqNvi">
                             <ref role="3TsBF5" to="vs0r:2mxBqlh$jZp" resolve="markedOk" />
@@ -3322,9 +3344,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7sHl0myfjlY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1$R" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7sHl0myfjmV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1$S" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3656,7 +3678,7 @@
                             <ref role="cht4Q" to="vs0r:K292flwDNu" resolve="AssessmentResultEntry" />
                           </node>
                           <node concept="37vLTw" id="5OvWdTSnW_r" role="1m5AlR">
-                            <ref role="3cqZAo" node="5OvWdTSnWti" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$T" resolve="it" />
                           </node>
                         </node>
                         <node concept="3TrcHB" id="2mxBqlhBGhe" role="2OqNvi">
@@ -3665,9 +3687,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5OvWdTSnWti" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1$T" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5OvWdTSnWtj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1$U" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3722,7 +3744,7 @@
                                     <ref role="cht4Q" to="vs0r:K292flwDNu" resolve="AssessmentResultEntry" />
                                   </node>
                                   <node concept="37vLTw" id="5OvWdTSovjv" role="1m5AlR">
-                                    <ref role="3cqZAo" node="5OvWdTSolXP" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1$V" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrcHB" id="2mxBqlhBH8P" role="2OqNvi">
@@ -3732,9 +3754,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5OvWdTSolXP" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1$V" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5OvWdTSolXQ" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1$W" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3928,7 +3950,7 @@
                     <node concept="3fqX7Q" id="3jNX2XuL9hO" role="3clFbG">
                       <node concept="2OqwBi" id="2mxBqlhBEai" role="3fr31v">
                         <node concept="37vLTw" id="2mxBqlhBE7l" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3jNX2XuL9hL" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1$X" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="2mxBqlhBEVl" role="2OqNvi">
                           <ref role="3TsBF5" to="vs0r:2mxBqlh$jZp" resolve="markedOk" />
@@ -3937,9 +3959,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3jNX2XuL9hL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1$X" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3jNX2XuL9hM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1$Y" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3999,7 +4021,7 @@
                       <node concept="3clFbF" id="3jNX2XuLACU" role="3cqZAp">
                         <node concept="2OqwBi" id="3jNX2XuLACV" role="3clFbG">
                           <node concept="37vLTw" id="3jNX2XuLACW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3jNX2XuLACZ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$Z" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="3jNX2XuLACX" role="2OqNvi">
                             <node concept="chp4Y" id="3jNX2XuLACY" role="cj9EA">
@@ -4009,9 +4031,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3jNX2XuLACZ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1$Z" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3jNX2XuLAD0" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1_0" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4037,7 +4059,7 @@
                     <node concept="3clFbF" id="3jNX2XuLADJ" role="3cqZAp">
                       <node concept="37vLTI" id="3jNX2XuLAEx" role="3clFbG">
                         <node concept="37vLTw" id="3jNX2XuLAE$" role="37vLTx">
-                          <ref role="3cqZAo" node="3jNX2XuLADw" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_1" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="3jNX2XuLAE5" role="37vLTJ">
                           <node concept="37vLTw" id="3jNX2XuLADK" role="2Oq$k0">
@@ -4055,9 +4077,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3jNX2XuLADw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_1" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3jNX2XuLADx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_2" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4878,7 +4900,7 @@
                       </node>
                       <node concept="2OqwBi" id="jS_CvxKV4i" role="3uHU7B">
                         <node concept="37vLTw" id="jS_CvxKV4j" role="2Oq$k0">
-                          <ref role="3cqZAo" node="jS_CvxKV4l" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_3" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="jS_CvxKV4k" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4887,9 +4909,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="jS_CvxKV4l" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="jS_CvxKV4m" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5378,7 +5400,7 @@
                     <node concept="3clFbF" id="1KUGD$rVBYr" role="3cqZAp">
                       <node concept="2OqwBi" id="1KUGD$rVBYs" role="3clFbG">
                         <node concept="37vLTw" id="1KUGD$rVBYt" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1KUGD$rVBYv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_5" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="1KUGD$rVBYu" role="2OqNvi">
                           <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -5386,9 +5408,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1KUGD$rVBYv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1KUGD$rVBYw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5493,7 +5515,7 @@
                         <node concept="3clFbF" id="dJX1uxf04U" role="3cqZAp">
                           <node concept="2OqwBi" id="dJX1uxf08F" role="3clFbG">
                             <node concept="37vLTw" id="dJX1uxf04T" role="2Oq$k0">
-                              <ref role="3cqZAo" node="dJX1uxeZUX" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_7" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="dJX1uxf0G8" role="2OqNvi">
                               <ref role="37wK5l" node="6clJcrKt_a0" resolve="isReexported" />
@@ -5501,9 +5523,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="dJX1uxeZUX" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1_7" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="dJX1uxeZUY" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1_8" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5532,7 +5554,7 @@
                   <node concept="3clFbF" id="GGvIiBXMQf" role="3cqZAp">
                     <node concept="2OqwBi" id="GGvIiBXMU2" role="3clFbG">
                       <node concept="37vLTw" id="GGvIiBXMQe" role="2Oq$k0">
-                        <ref role="3cqZAo" node="GGvIiBXMHP" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_9" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="GGvIiBXNvv" role="2OqNvi">
                         <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -5540,9 +5562,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="GGvIiBXMHP" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="GGvIiBXMHQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_a" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5627,7 +5649,7 @@
                     <node concept="3clFbF" id="4Y70f4E$oo1" role="3cqZAp">
                       <node concept="2OqwBi" id="4Y70f4E$oo2" role="3clFbG">
                         <node concept="37vLTw" id="4Y70f4E$oo3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4Y70f4E$oo7" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_b" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4Y70f4E$oo4" role="2OqNvi">
                           <node concept="25Kdxt" id="78ltAeXItXZ" role="cj9EA">
@@ -5639,9 +5661,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4Y70f4E$oo7" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_b" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4Y70f4E$oo8" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_c" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5671,7 +5693,7 @@
                                   <ref role="cht4Q" to="vs0r:6clJcrKm6q5" resolve="IVisibleElementAdapter" />
                                 </node>
                                 <node concept="37vLTw" id="4Y70f4E$oBf" role="1m5AlR">
-                                  <ref role="3cqZAo" node="4Y70f4E$oBo" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1_d" resolve="it" />
                                 </node>
                               </node>
                               <node concept="2qgKlT" id="4Y70f4E$oBg" role="2OqNvi">
@@ -5688,7 +5710,7 @@
                           </node>
                           <node concept="2OqwBi" id="4Y70f4E$oBk" role="3uHU7B">
                             <node concept="37vLTw" id="4Y70f4E$oBl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4Y70f4E$oBo" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_d" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="4Y70f4E$oBm" role="2OqNvi">
                               <node concept="chp4Y" id="4Y70f4E$oBn" role="cj9EA">
@@ -5699,9 +5721,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4Y70f4E$oBo" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1_d" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4Y70f4E$oBp" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1_e" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5716,7 +5738,7 @@
                             <ref role="cht4Q" to="vs0r:6clJcrKm6q5" resolve="IVisibleElementAdapter" />
                           </node>
                           <node concept="37vLTw" id="4Y70f4E$oBw" role="1m5AlR">
-                            <ref role="3cqZAo" node="4Y70f4E$oBy" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1_f" resolve="it" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="4Y70f4E$oBx" role="2OqNvi">
@@ -5725,9 +5747,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4Y70f4E$oBy" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_f" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4Y70f4E$oBz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_g" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5847,7 +5869,7 @@
                           </node>
                           <node concept="2OqwBi" id="94IdDL6TAi" role="3uHU7B">
                             <node concept="37vLTw" id="94IdDL6TAj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="94IdDL6TAl" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_h" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="94IdDL6TAk" role="2OqNvi">
                               <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -5856,9 +5878,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="94IdDL6TAl" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1_h" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="94IdDL6TAm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1_i" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6078,7 +6100,7 @@
                   <node concept="3clFbF" id="7XSydr1AnG" role="3cqZAp">
                     <node concept="2OqwBi" id="7XSydr1AuB" role="3clFbG">
                       <node concept="37vLTw" id="7XSydr1AnF" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7XSydr1$0e" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_j" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="7XSydr1BF7" role="2OqNvi">
                         <node concept="25Kdxt" id="7XSydr1Gei" role="cj9EA">
@@ -6090,9 +6112,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7XSydr1$0e" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_j" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7XSydr1$0f" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_k" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6128,7 +6150,7 @@
                       </node>
                       <node concept="2OqwBi" id="4ryX3g5grjG" role="3uHU7B">
                         <node concept="37vLTw" id="4ryX3g5grfV" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4ryX3g5grbW" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_l" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="4ryX3g5grLT" role="2OqNvi">
                           <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -6137,9 +6159,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4ryX3g5grbW" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_l" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4ryX3g5grbX" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_m" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6329,7 +6351,7 @@
                                     <node concept="3clFbF" id="5EE0R5HKLWL" role="3cqZAp">
                                       <node concept="2OqwBi" id="5EE0R5HKLWM" role="3clFbG">
                                         <node concept="37vLTw" id="5EE0R5HKLWN" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5EE0R5HKLWP" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1_n" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="5EE0R5HKLWO" role="2OqNvi">
                                           <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -6337,9 +6359,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5EE0R5HKLWP" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1_n" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5EE0R5HKLWQ" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1_o" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -6550,16 +6572,16 @@
                                         </node>
                                         <node concept="2OqwBi" id="5EE0R5HKNaQ" role="1m5AlR">
                                           <node concept="37vLTw" id="5EE0R5HKNaR" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5EE0R5HKNaT" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1_p" resolve="it" />
                                           </node>
                                           <node concept="1mfA1w" id="5EE0R5HKNaS" role="2OqNvi" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5EE0R5HKNaT" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1_p" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5EE0R5HKNaU" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1_q" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -6639,7 +6661,7 @@
                     <node concept="3clFbF" id="17fjvcLEqVq" role="3cqZAp">
                       <node concept="2OqwBi" id="17fjvcLEr01" role="3clFbG">
                         <node concept="37vLTw" id="17fjvcLEqVp" role="2Oq$k0">
-                          <ref role="3cqZAo" node="17fjvcLEqPM" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_r" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="17fjvcLErcR" role="2OqNvi">
                           <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -6647,9 +6669,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="17fjvcLEqPM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_r" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="17fjvcLEqPN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_s" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7390,7 +7412,7 @@
                           <node concept="3clFbF" id="70aAUsa1OlI" role="3cqZAp">
                             <node concept="2OqwBi" id="70aAUsa1OME" role="3clFbG">
                               <node concept="37vLTw" id="70aAUsa1OlH" role="2Oq$k0">
-                                <ref role="3cqZAo" node="70aAUsa1NVz" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1_t" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="70aAUsa1Pwb" role="2OqNvi">
                                 <ref role="37wK5l" node="3jNX2XuLy_p" resolve="update" />
@@ -7398,9 +7420,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="70aAUsa1NVz" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1_t" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="70aAUsa1NV$" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1_u" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -7889,7 +7911,7 @@
                     <node concept="3fqX7Q" id="4k0bDztZppf" role="3clFbG">
                       <node concept="2OqwBi" id="4k0bDztZq_w" role="3fr31v">
                         <node concept="37vLTw" id="4k0bDztZptr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4k0bDztZmlx" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_v" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="4k0bDztZs8o" role="2OqNvi">
                           <ref role="37wK5l" node="4k0bDztYlgO" resolve="isConstantLike" />
@@ -7898,9 +7920,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4k0bDztZmlx" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_v" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4k0bDztZmly" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_w" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7938,7 +7960,7 @@
                   <node concept="3clFbF" id="4k0bDztZtBT" role="3cqZAp">
                     <node concept="2OqwBi" id="4k0bDztZtBV" role="3clFbG">
                       <node concept="37vLTw" id="4k0bDztZtBW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4k0bDztZtBY" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_x" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4k0bDztZtBX" role="2OqNvi">
                         <ref role="37wK5l" node="4k0bDztYlgO" resolve="isConstantLike" />
@@ -7946,9 +7968,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4k0bDztZtBY" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_x" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4k0bDztZtBZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_y" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8094,7 +8116,7 @@
                           <node concept="3clFbF" id="4k0bDztYHn4" role="3cqZAp">
                             <node concept="2OqwBi" id="4k0bDztYHn5" role="3clFbG">
                               <node concept="37vLTw" id="4k0bDztYHn6" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4k0bDztYHn8" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1_z" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="4k0bDztYHn7" role="2OqNvi">
                                 <ref role="37wK5l" node="2GIWVTRLmpu" resolve="getControlledNames" />
@@ -8102,9 +8124,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4k0bDztYHn8" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1_z" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4k0bDztYHn9" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1_$" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -8671,7 +8693,7 @@
                   <node concept="3clFbF" id="$bJ0jh_hml" role="3cqZAp">
                     <node concept="2OqwBi" id="$bJ0jh_hrz" role="3clFbG">
                       <node concept="37vLTw" id="$bJ0jh_hmk" role="2Oq$k0">
-                        <ref role="3cqZAo" node="$bJ0jh_he0" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1__" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="1PjfO$xZLUL" role="2OqNvi">
                         <ref role="37wK5l" node="$bJ0jh_4MI" resolve="clearDebugger" />
@@ -8679,9 +8701,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="$bJ0jh_he0" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1__" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="$bJ0jh_he1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_A" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8843,7 +8865,7 @@
                   <node concept="3clFbF" id="6KLCBzCTpEG" role="3cqZAp">
                     <node concept="2OqwBi" id="6KLCBzCTsrB" role="3clFbG">
                       <node concept="37vLTw" id="6KLCBzCTsp9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6KLCBzCTpEL" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_B" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6KLCBzCTsIy" role="2OqNvi">
                         <ref role="37wK5l" node="6KLCBzCTpEk" resolve="updateDebugger" />
@@ -8857,9 +8879,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6KLCBzCTpEL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_B" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6KLCBzCTpEM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_C" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8913,7 +8935,7 @@
                   <node concept="3clFbF" id="3$DH87aJWhe" role="3cqZAp">
                     <node concept="2OqwBi" id="3$DH87aJWkF" role="3clFbG">
                       <node concept="37vLTw" id="3$DH87aJWhd" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3$DH87aJPG9" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_D" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3$DH87aJWDV" role="2OqNvi">
                         <ref role="37wK5l" node="3$DH87aJJo_" resolve="updateDebuggerPresentation" />
@@ -8924,9 +8946,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3$DH87aJPG9" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_D" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3$DH87aJPGa" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_E" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9364,7 +9386,7 @@
                       <node concept="17R0WA" id="2BbcAuIdRxO" role="3clFbG">
                         <node concept="2OqwBi" id="2BbcAuIdROj" role="3uHU7w">
                           <node concept="37vLTw" id="2BbcAuIdRCy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2BbcAuIdR8p" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1_F" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2BbcAuIdS6i" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -9376,9 +9398,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2BbcAuIdR8p" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_F" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2BbcAuIdR8q" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_G" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9436,7 +9458,7 @@
                   <node concept="3clFbF" id="6KLCBzCThib" role="3cqZAp">
                     <node concept="2OqwBi" id="6KLCBzCThlF" role="3clFbG">
                       <node concept="37vLTw" id="6KLCBzCThi9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="$bJ0jgQ84G" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_H" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6KLCBzCThER" role="2OqNvi">
                         <ref role="37wK5l" node="6KLCBzCTbNC" resolve="setDebuggerExpanded" />
@@ -9447,9 +9469,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="$bJ0jgQ84G" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_H" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="$bJ0jgQ84H" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_I" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9493,7 +9515,7 @@
                   <node concept="3clFbF" id="$bJ0jgQ85a" role="3cqZAp">
                     <node concept="2OqwBi" id="6KLCBzCTij6" role="3clFbG">
                       <node concept="37vLTw" id="6KLCBzCTigC" role="2Oq$k0">
-                        <ref role="3cqZAo" node="$bJ0jgQ85j" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_J" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6KLCBzCTiA9" role="2OqNvi">
                         <ref role="37wK5l" node="6KLCBzCTbNC" resolve="setDebuggerExpanded" />
@@ -9504,9 +9526,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="$bJ0jgQ85j" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_J" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="$bJ0jgQ85k" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_K" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12884,7 +12906,7 @@
                         <node concept="10QFUN" id="4WlWim9tYKs" role="1eOMHV">
                           <node concept="2OqwBi" id="4WlWim9tYKn" role="10QFUP">
                             <node concept="37vLTw" id="4WlWim9tYKo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4WlWim9tXCM" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_L" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4WlWim9tYKp" role="2OqNvi">
                               <ref role="37wK5l" node="7NyyyjNtbn2" resolve="getTreeNode" />
@@ -12900,9 +12922,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4WlWim9tXCM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_L" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4WlWim9tXCN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_M" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -16601,7 +16623,7 @@
                         <node concept="10QFUN" id="6SQk4GjViNC" role="1eOMHV">
                           <node concept="2OqwBi" id="6SQk4GjViNz" role="10QFUP">
                             <node concept="37vLTw" id="6SQk4GjViN$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6SQk4GjVgY1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_N" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="6SQk4GjViN_" role="2OqNvi">
                               <ref role="37wK5l" node="7NyyyjNtbn2" resolve="getTreeNode" />
@@ -16617,9 +16639,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6SQk4GjVgY1" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_N" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6SQk4GjVgY2" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_O" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -17607,12 +17629,17 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="5stuwjVnLDH" role="2GsD0m">
-            <node concept="37vLTw" id="5stuwjVnLDI" role="2Oq$k0">
-              <ref role="3cqZAo" node="5stuwjVnI$6" resolve="proj" />
+          <node concept="2OqwBi" id="2x4nHT4_e94" role="2GsD0m">
+            <node concept="2OqwBi" id="5stuwjVnLDH" role="2Oq$k0">
+              <node concept="37vLTw" id="5stuwjVnLDI" role="2Oq$k0">
+                <ref role="3cqZAo" node="5stuwjVnI$6" resolve="proj" />
+              </node>
+              <node concept="liA8E" id="1k7U37Yw6sq" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
+              </node>
             </node>
-            <node concept="liA8E" id="1k7U37Yw6sq" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getProjectModels()" resolve="getProjectModels" />
+            <node concept="liA8E" id="2x4nHT4_eOB" role="2OqNvi">
+              <ref role="37wK5l" to="w1kc:~BaseScope.getModels()" resolve="getModels" />
             </node>
           </node>
         </node>
@@ -18258,7 +18285,7 @@
                         <node concept="2OqwBi" id="1OJ4NX2DwZL" role="37wK5m">
                           <node concept="2OqwBi" id="1OJ4NX2DwZM" role="2Oq$k0">
                             <node concept="37vLTw" id="1OJ4NX2DwZN" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1OJ4NX2Dx05" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_P" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="1OJ4NX2DwZO" role="2OqNvi">
                               <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -18269,7 +18296,7 @@
                           </node>
                         </node>
                         <node concept="37vLTw" id="1OJ4NX2DwZQ" role="37wK5m">
-                          <ref role="3cqZAo" node="1OJ4NX2Dx05" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_P" resolve="it" />
                         </node>
                         <node concept="Xl_RD" id="1OJ4NX2DwZR" role="37wK5m">
                           <property role="Xl_RC" value="imports" />
@@ -18298,7 +18325,7 @@
                       <ref role="37wK5l" node="1OJ4NX2EYxc" resolve="addChunk" />
                       <node concept="2OqwBi" id="1OJ4NX2EKLX" role="37wK5m">
                         <node concept="37vLTw" id="1OJ4NX2EKuE" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1OJ4NX2Dx05" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1_P" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="1OJ4NX2ELoK" role="2OqNvi">
                           <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
@@ -18313,9 +18340,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1OJ4NX2Dx05" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_P" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1OJ4NX2Dx06" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_Q" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -18341,7 +18368,7 @@
                         <ref role="3cqZAo" node="1OJ4NX2DwZl" resolve="vsource" />
                       </node>
                       <node concept="37vLTw" id="1OJ4NX2SbqX" role="37wK5m">
-                        <ref role="3cqZAo" node="1OJ4NX2S0HX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1_R" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="1OJ4NX2SbGP" role="37wK5m">
                         <ref role="3cqZAo" node="1OJ4NX2E59I" resolve="g" />
@@ -18349,9 +18376,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1OJ4NX2S0HX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1_R" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1OJ4NX2S0HY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1_S" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -18602,7 +18629,7 @@
                       <node concept="3y3z36" id="1OJ4NX3h1Re" role="3clFbG">
                         <node concept="2OqwBi" id="1OJ4NX3h1Rf" role="3uHU7w">
                           <node concept="37vLTw" id="1OJ4NX3h1Rg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1OJ4NX3h1Rr" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1_T" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="1OJ4NX3h1Rh" role="2OqNvi">
                             <node concept="1xMEDy" id="1OJ4NX3h1Ri" role="1xVPHs">
@@ -18615,7 +18642,7 @@
                         <node concept="2OqwBi" id="1OJ4NX3h1Rk" role="3uHU7B">
                           <node concept="2OqwBi" id="1OJ4NX3h1Rl" role="2Oq$k0">
                             <node concept="37vLTw" id="1OJ4NX3h1Rm" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1OJ4NX3h1Rr" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_T" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="1OJ4NX3h1Rn" role="2OqNvi">
                               <ref role="37wK5l" node="70kXLV4LLzy" resolve="target" />
@@ -18632,9 +18659,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1OJ4NX3h1Rr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_T" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1OJ4NX3h1Rs" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_U" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -18660,7 +18687,7 @@
                       <node concept="2OqwBi" id="1OJ4NX3h2Xy" role="3clFbG">
                         <node concept="2OqwBi" id="1OJ4NX3h2Xz" role="2Oq$k0">
                           <node concept="37vLTw" id="1OJ4NX3h2X$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1OJ4NX3h2XC" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1_V" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="1OJ4NX3h2X_" role="2OqNvi">
                             <ref role="37wK5l" node="70kXLV4LLzy" resolve="target" />
@@ -18674,9 +18701,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1OJ4NX3h2XC" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_V" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1OJ4NX3h2XD" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_W" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -18708,7 +18735,7 @@
                             </node>
                             <node concept="2OqwBi" id="1OJ4NX3lhPJ" role="1m5AlR">
                               <node concept="37vLTw" id="1OJ4NX3lhgd" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1OJ4NX3lh53" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1_X" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="1OJ4NX3liqT" role="2OqNvi">
                                 <ref role="37wK5l" node="70kXLV4LLzy" resolve="target" />
@@ -18722,9 +18749,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1OJ4NX3lh53" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_X" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1OJ4NX3lh54" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1_Y" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -18751,7 +18778,7 @@
                         <node concept="2OqwBi" id="2QWptevxIxl" role="2Oq$k0">
                           <node concept="2OqwBi" id="49Pc$RE4mEI" role="2Oq$k0">
                             <node concept="37vLTw" id="2QWptevxIgv" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1cocmT__j02" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1_Z" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="49Pc$RE4nAO" role="2OqNvi">
                               <ref role="37wK5l" node="70kXLV4LLzy" resolve="target" />
@@ -18767,9 +18794,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1cocmT__j02" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1_Z" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1cocmT__j03" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1A0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -18806,7 +18833,7 @@
                             </node>
                             <node concept="2OqwBi" id="1OJ4NX3j2Fd" role="1m5AlR">
                               <node concept="37vLTw" id="1OJ4NX3938G" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1OJ4NX392Pa" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1A1" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="1OJ4NX3j3dh" role="2OqNvi">
                                 <ref role="37wK5l" node="70kXLV4LLzy" resolve="target" />
@@ -18818,7 +18845,7 @@
                           </node>
                         </node>
                         <node concept="37vLTw" id="1OJ4NX394Vr" role="37wK5m">
-                          <ref role="3cqZAo" node="1OJ4NX392Pa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1A1" resolve="it" />
                         </node>
                         <node concept="Xl_RD" id="1OJ4NX38Rgf" role="37wK5m">
                           <property role="Xl_RC" value="calls" />
@@ -18827,9 +18854,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1OJ4NX392Pa" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1A1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1OJ4NX392Pb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1A2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -19338,14 +19365,14 @@
                       <ref role="37wK5l" to="mhbf:~SNodeUtil.getDescendants(org.jetbrains.mps.openapi.model.SModel)" resolve="getDescendants" />
                       <ref role="1Pybhc" to="mhbf:~SNodeUtil" resolve="SNodeUtil" />
                       <node concept="37vLTw" id="4PRpvcZBVJ2" role="37wK5m">
-                        <ref role="3cqZAo" node="4PRpvcZBN2L" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1A3" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4PRpvcZBN2L" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1A3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4PRpvcZBN2M" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1A4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -19763,8 +19790,9 @@
         <node concept="3cpWs8" id="4PRpvcZCfhP" role="3cqZAp">
           <node concept="3cpWsn" id="4PRpvcZCfhQ" role="3cpWs9">
             <property role="TrG5h" value="project" />
+            <property role="3TUv4t" value="true" />
             <node concept="3uibUv" id="4PRpvcZCmYz" role="1tU5fm">
-              <ref role="3uigEE" to="z1c4:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
+              <ref role="3uigEE" to="z1c5:~MPSProject" resolve="MPSProject" />
             </node>
             <node concept="10QFUN" id="4PRpvcZCh8o" role="33vP2m">
               <node concept="2OqwBi" id="4PRpvcZCh8c" role="10QFUP">
@@ -19777,7 +19805,7 @@
                       <node concept="3clFbF" id="4PRpvcZCh8h" role="3cqZAp">
                         <node concept="2OqwBi" id="4PRpvcZCh8i" role="3clFbG">
                           <node concept="37vLTw" id="4PRpvcZCh8j" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4PRpvcZCh8m" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1A5" resolve="it" />
                           </node>
                           <node concept="liA8E" id="4PRpvcZCh8k" role="2OqNvi">
                             <ref role="37wK5l" to="z1c3:~Project.isProjectModule(org.jetbrains.mps.openapi.module.SModule)" resolve="isProjectModule" />
@@ -19788,15 +19816,15 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4PRpvcZCh8m" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1A5" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4PRpvcZCh8n" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1A6" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
               </node>
               <node concept="3uibUv" id="4PRpvcZCmGz" role="10QFUM">
-                <ref role="3uigEE" to="z1c4:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
+                <ref role="3uigEE" to="z1c5:~MPSProject" resolve="MPSProject" />
               </node>
             </node>
           </node>
@@ -19805,17 +19833,22 @@
         <node concept="3cpWs8" id="4PRpvcZCjWa" role="3cqZAp">
           <node concept="3cpWsn" id="4PRpvcZCjWb" role="3cpWs9">
             <property role="TrG5h" value="projectModules" />
-            <node concept="_YKpA" id="4PRpvcZCk6g" role="1tU5fm">
-              <node concept="3uibUv" id="4PRpvcZCk6i" role="_ZDj9">
-                <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+            <node concept="2OqwBi" id="6PcyHXr8j8L" role="33vP2m">
+              <node concept="2OqwBi" id="4PRpvcZCjWc" role="2Oq$k0">
+                <node concept="37vLTw" id="4PRpvcZCjWd" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4PRpvcZCfhQ" resolve="project" />
+                </node>
+                <node concept="liA8E" id="6PcyHXr8idL" role="2OqNvi">
+                  <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
+                </node>
               </node>
-            </node>
-            <node concept="2OqwBi" id="4PRpvcZCjWc" role="33vP2m">
-              <node concept="37vLTw" id="4PRpvcZCjWd" role="2Oq$k0">
-                <ref role="3cqZAo" node="4PRpvcZCfhQ" resolve="project" />
+              <node concept="liA8E" id="6PcyHXr8kAH" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project$ProjectScope.getModules()" resolve="getModules" />
               </node>
-              <node concept="liA8E" id="4PRpvcZCjWe" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~ProjectBase.getProjectModules()" resolve="getProjectModules" />
+            </node>
+            <node concept="A3Dl8" id="6PcyHXr8lOW" role="1tU5fm">
+              <node concept="3uibUv" id="6PcyHXr8lOY" role="A3Ik2">
+                <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
               </node>
             </node>
           </node>
@@ -19844,9 +19877,9 @@
                               <ref role="3cqZAo" node="4PRpvcZCfhQ" resolve="project" />
                             </node>
                             <node concept="liA8E" id="4PRpvcZCnLb" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c4:~StandaloneMPSProject.getFolderFor(org.jetbrains.mps.openapi.module.SModule)" resolve="getFolderFor" />
+                              <ref role="37wK5l" to="z1c3:~ProjectBase.getVirtualFolder(org.jetbrains.mps.openapi.module.SModule)" resolve="getVirtualFolder" />
                               <node concept="37vLTw" id="4PRpvcZCnV7" role="37wK5m">
-                                <ref role="3cqZAo" node="4PRpvcZClZq" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1A7" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -19854,9 +19887,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4PRpvcZClZq" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1A7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4PRpvcZClZr" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1A8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -19870,7 +19903,7 @@
                         <node concept="10QFUN" id="4PRpvcZCsnn" role="1eOMHV">
                           <node concept="2OqwBi" id="4PRpvcZCsnk" role="10QFUP">
                             <node concept="37vLTw" id="4PRpvcZCsnl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4PRpvcZCqzo" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ab" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4PRpvcZCsnm" role="2OqNvi">
                               <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
@@ -19887,24 +19920,24 @@
                             <node concept="3clFbF" id="4PRpvcZCuJv" role="3cqZAp">
                               <node concept="2OqwBi" id="4PRpvcZCv2o" role="3clFbG">
                                 <node concept="37vLTw" id="4PRpvcZCuJu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4PRpvcZCusP" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1A9" resolve="it" />
                                 </node>
                                 <node concept="2SmgA7" id="4PRpvcZCvss" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4PRpvcZCusP" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1A9" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4PRpvcZCusQ" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Aa" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4PRpvcZCqzo" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Ab" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4PRpvcZCqzp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ac" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/com.mbeddr.core.base.enumMigration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/com.mbeddr.core.base.enumMigration.mps
index 6c649e83e38..fe9b508d571 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/com.mbeddr.core.base.enumMigration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/com.mbeddr.core.base.enumMigration.mps
@@ -49,7 +49,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -93,7 +93,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/constraints.mps
index dd19a6db3a0..60e2c953109 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/constraints.mps
@@ -111,7 +111,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,7 +124,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -171,6 +171,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -225,7 +226,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -251,7 +252,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -871,12 +871,12 @@
                                 </node>
                               </node>
                               <node concept="37vLTw" id="5CkU_dHiezP" role="3uHU7B">
-                                <ref role="3cqZAo" node="5CkU_dHiezT" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1$1" resolve="it" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="5CkU_dHiezQ" role="3uHU7B">
                               <node concept="37vLTw" id="5CkU_dHiezR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHiezT" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1$1" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="5CkU_dHiezS" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:7aNtjNmcVtH" resolve="importedByDefGenChunkDep" />
@@ -885,9 +885,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHiezT" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$1" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHiezU" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$2" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
index 4ec20dc4e46..7fd7fb63c16 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
@@ -68,11 +68,12 @@
     <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
+    <import index="j936" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.ui(MPS.IDEA/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" />
-    <import index="j936" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.ui(MPS.IDEA/)" />
+    <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
   </imports>
   <registry>
     <language id="b8bb702e-43ed-4090-a902-d180d3e5f292" name="de.slisson.mps.conditionalEditor">
@@ -97,7 +98,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -215,10 +216,10 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -275,7 +276,7 @@
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -294,6 +295,12 @@
         <child id="730181322658904467" name="menuReference" index="1s_PAo" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
+      <concept id="9122903797336200704" name="jetbrains.mps.lang.editor.structure.ApplyStyleClassCondition" flags="lg" index="1uO$qF">
+        <child id="9122903797336200706" name="query" index="1uO$qD" />
+      </concept>
+      <concept id="9122903797312246523" name="jetbrains.mps.lang.editor.structure.StyleReference" flags="ng" index="1wgc9g">
+        <reference id="9122903797312247166" name="style" index="1wgcnl" />
+      </concept>
       <concept id="1075375595203" name="jetbrains.mps.lang.editor.structure.CellModel_Error" flags="sg" stub="8104358048506729356" index="1xolST">
         <property id="1075375595204" name="text" index="1xolSY" />
       </concept>
@@ -323,7 +330,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -334,7 +341,7 @@
         <child id="1182233390675" name="filter" index="12AuX0" />
       </concept>
       <concept id="1176474535556" name="jetbrains.mps.lang.editor.structure.QueryFunction_JComponent" flags="in" index="3Fmcul" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -348,7 +355,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="6918029743850363447" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_targetNode" flags="ng" index="1NM5Ph" />
@@ -373,6 +380,9 @@
       <concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
       <concept id="4307758654696938365" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_RefPresentation" flags="ig" index="1WAQ3h" />
       <concept id="4307758654696952957" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ReferencedNode" flags="ng" index="1WAUZh" />
+      <concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
+        <child id="1950447826683828796" name="target" index="3XvnJa" />
+      </concept>
       <concept id="1166040637528" name="jetbrains.mps.lang.editor.structure.CellMenuComponent" flags="ng" index="1Xs25n">
         <child id="1166040865497" name="applicableFeature" index="1XsTJm" />
         <child id="1166041505377" name="menuDescriptor" index="1XvlXI" />
@@ -419,7 +429,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -560,7 +570,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -591,7 +601,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -636,6 +646,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -754,7 +765,9 @@
       <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
         <child id="1140131861877" name="replacementNode" index="1P9ThW" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -774,7 +787,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -10353,6 +10366,39 @@
     </node>
     <node concept="14StLt" id="2CEi94dprSJ" role="V601i">
       <property role="TrG5h" value="TextComment" />
+      <node concept="1uO$qF" id="1C4$MxwnSOp" role="3F10Kt">
+        <node concept="3nzxsE" id="1C4$MxwnSOr" role="1uO$qD">
+          <node concept="3clFbS" id="1C4$MxwnSOt" role="2VODD2">
+            <node concept="3clFbF" id="1C4$MxwnT6e" role="3cqZAp">
+              <node concept="1Wc70l" id="1C4$MxwnVgM" role="3clFbG">
+                <node concept="2OqwBi" id="1C4$MxwnVKv" role="3uHU7w">
+                  <node concept="1PxgMI" id="1C4$MxwnVlY" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="1C4$MxwnV$G" role="3oSUPX">
+                      <ref role="cht4Q" to="vs0r:6yeRgC0uAED" resolve="IIsDocumentationComment" />
+                    </node>
+                    <node concept="pncrf" id="1C4$MxwnViy" role="1m5AlR" />
+                  </node>
+                  <node concept="2qgKlT" id="1C4$MxwnVZ4" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcu:fB3l7ZufMD" resolve="isTODOComment" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="1C4$MxwnTuh" role="3uHU7B">
+                  <node concept="pncrf" id="1C4$MxwnT6d" role="2Oq$k0" />
+                  <node concept="1mIQ4w" id="1C4$MxwnTJH" role="2OqNvi">
+                    <node concept="chp4Y" id="1C4$MxwnU0R" role="cj9EA">
+                      <ref role="cht4Q" to="vs0r:6yeRgC0uAED" resolve="IIsDocumentationComment" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1wgc9g" id="1C4$MxwnSOv" role="3XvnJa">
+          <ref role="1wgcnl" node="1C4$MxwsABx" resolve="TODO" />
+        </node>
+      </node>
       <node concept="Vb9p2" id="2CEi94dprSK" role="3F10Kt">
         <property role="Vbekb" value="g1_kEg4/ITALIC" />
       </node>
@@ -10363,6 +10409,21 @@
       </node>
       <node concept="2lhJJ2" id="2CEi94dprSN" role="14Sbyx" />
     </node>
+    <node concept="14StLt" id="1C4$MxwsABx" role="V601i">
+      <property role="TrG5h" value="TODO" />
+      <node concept="3Xmtl4" id="1C4$MxwsAGW" role="3F10Kt">
+        <node concept="1wgc9g" id="1C4$MxwsAGY" role="3XvnJa">
+          <ref role="1wgcnl" to="tpen:aeM1BF$INI" />
+        </node>
+      </node>
+      <node concept="2lhJJ2" id="1C4$MxwsALw" role="14Sbyx">
+        <node concept="1ybEpN" id="1C4$Mxwu6DM" role="2lhEPC">
+          <node concept="14SbXO" id="1C4$Mxwu6DL" role="1ybEBM">
+            <ref role="14SbXR" node="2CEi94dprSJ" resolve="TextComment" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="14StLt" id="2CEi94dhrPl" role="V601i">
       <property role="TrG5h" value="TextCommentTag" />
       <node concept="Vb9p2" id="2CEi94dhrPm" role="3F10Kt">
@@ -11908,15 +11969,15 @@
               <node concept="3clFbH" id="3VQE5sAu0YC" role="3cqZAp" />
               <node concept="3clFbF" id="3VQE5sAfNae" role="3cqZAp">
                 <node concept="2OqwBi" id="3VQE5sAfOCo" role="3clFbG">
-                  <node concept="37vLTw" id="5g63V59pYGE" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5g63V59pYG_" resolve="g2d" />
-                  </node>
                   <node concept="liA8E" id="3VQE5sAfPYp" role="2OqNvi">
                     <ref role="37wK5l" to="z60i:~Graphics2D.fill(java.awt.Shape)" resolve="fill" />
                     <node concept="37vLTw" id="3VQE5sAfVf1" role="37wK5m">
                       <ref role="3cqZAo" node="3VQE5sAfwXR" resolve="shape0" />
                     </node>
                   </node>
+                  <node concept="37vLTw" id="5g63V59pYGE" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5g63V59pYG_" resolve="g2d" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -12274,7 +12335,7 @@
                                   <node concept="3clFbF" id="4wfIO$Jq9s$" role="3cqZAp">
                                     <node concept="2OqwBi" id="4wfIO$Jq9s_" role="3clFbG">
                                       <node concept="37vLTw" id="4wfIO$Jq9sA" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4wfIO$Jq9sI" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1$7" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="4wfIO$Jq9sB" role="2OqNvi">
                                         <ref role="37wK5l" to="w1kc:~SNodePointer.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -12295,9 +12356,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4wfIO$Jq9sI" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1$7" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4wfIO$Jq9sJ" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1$8" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -12334,7 +12395,7 @@
                                       <node concept="1pGfFk" id="4wfIO$Jq9t5" role="2ShVmc">
                                         <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
                                         <node concept="37vLTw" id="4wfIO$Jq9t6" role="37wK5m">
-                                          <ref role="3cqZAo" node="4wfIO$Jq9t8" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1$9" resolve="it" />
                                         </node>
                                         <node concept="Xl_RD" id="4wfIO$Jq9t7" role="37wK5m">
                                           <property role="Xl_RC" value="value" />
@@ -12345,9 +12406,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4wfIO$Jq9t8" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1$9" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4wfIO$Jq9t9" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1$a" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -12647,7 +12708,7 @@
                                 <node concept="3clFbF" id="2C05Nls9_IE" role="3cqZAp">
                                   <node concept="2OqwBi" id="2C05Nls9AH0" role="3clFbG">
                                     <node concept="37vLTw" id="2C05Nls9_ID" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2C05Nls9_fi" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1$b" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="2C05Nls9BkL" role="2OqNvi">
                                       <ref role="37wK5l" to="w1kc:~SNodePointer.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -12668,9 +12729,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2C05Nls9_fi" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1$b" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2C05Nls9_fj" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1$c" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -12707,7 +12768,7 @@
                                     <node concept="1pGfFk" id="5TykNF$xdUu" role="2ShVmc">
                                       <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
                                       <node concept="37vLTw" id="5TykNF$xdUv" role="37wK5m">
-                                        <ref role="3cqZAo" node="5TykNF$xdUx" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1$d" resolve="it" />
                                       </node>
                                       <node concept="Xl_RD" id="5TykNF$xdUw" role="37wK5m">
                                         <property role="Xl_RC" value="value" />
@@ -12718,9 +12779,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5TykNF$xdUx" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1$d" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5TykNF$xdUy" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1$e" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/findUsages.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/findUsages.mps
index 1da8381a743..07cb1ee2736 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/findUsages.mps
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps
index 3fc438ff190..4707478d092 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps
@@ -134,7 +134,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -154,7 +154,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -186,6 +186,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -265,7 +266,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -298,7 +299,6 @@
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -737,7 +737,7 @@
                           <node concept="2OqwBi" id="7ii2FhSH7F6" role="3clFbG">
                             <node concept="2OqwBi" id="7ii2FhSH7F7" role="2Oq$k0">
                               <node concept="37vLTw" id="7ii2FhSH7F8" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ii2FhSH7Fe" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1$f" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="7ii2FhSH7F9" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:2GIWVTRHLfj" resolve="getControlledName" />
@@ -752,9 +752,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7ii2FhSH7Fe" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$f" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7ii2FhSH7Ff" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$g" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -823,7 +823,7 @@
                       <node concept="2OqwBi" id="DXZ7aOB$k4" role="3clFbG">
                         <node concept="2OqwBi" id="DXZ7aOBzkk" role="2Oq$k0">
                           <node concept="37vLTw" id="DXZ7aOBzd$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="DXZ7aOByTm" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$h" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="DXZ7aOB$3u" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -837,9 +837,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="DXZ7aOByTm" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1$h" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="DXZ7aOByTn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1$i" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1051,7 +1051,7 @@
                       <node concept="2OqwBi" id="DXZ7aOBB1S" role="3clFbG">
                         <node concept="2OqwBi" id="DXZ7aOBB1T" role="2Oq$k0">
                           <node concept="37vLTw" id="DXZ7aOBB1U" role="2Oq$k0">
-                            <ref role="3cqZAo" node="DXZ7aOBB1Y" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$j" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="DXZ7aOBB1V" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -1065,9 +1065,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="DXZ7aOBB1Y" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1$j" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="DXZ7aOBB1Z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1$k" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/migration.mps
index 371ece93847..aef42534053 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/migration.mps
@@ -3,12 +3,12 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -37,7 +37,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -98,7 +98,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,7 +116,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -131,6 +131,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -215,7 +216,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -297,7 +298,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -378,7 +378,7 @@
                       <node concept="3clFbF" id="6v4$knuv4ah" role="3cqZAp">
                         <node concept="2OqwBi" id="6v4$knuv4dw" role="3clFbG">
                           <node concept="37vLTw" id="6v4$knuv4ag" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6v4$knuv45p" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Ad" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6v4$knuv4nY" role="2OqNvi">
                             <ref role="37wK5l" to="p15z:243ufko$Aur" resolve="performMigration" />
@@ -386,9 +386,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6v4$knuv45p" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ad" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6v4$knuv45q" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ae" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -468,7 +468,7 @@
                         <node concept="2OqwBi" id="4$snAjTN3pm" role="3clFbG">
                           <node concept="2JrnkZ" id="4$snAjTN3Hq" role="2Oq$k0">
                             <node concept="37vLTw" id="4$snAjTN3lj" role="2JrQYb">
-                              <ref role="3cqZAo" node="4$snAjTN3g8" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Af" resolve="it" />
                             </node>
                           </node>
                           <node concept="liA8E" id="4$snAjTN3Mz" role="2OqNvi">
@@ -482,9 +482,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4$snAjTN3g8" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Af" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4$snAjTN3g9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ag" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -564,7 +564,7 @@
                       <node concept="3clFbF" id="4uK_Ssze9Sy" role="3cqZAp">
                         <node concept="2OqwBi" id="4uK_Ssze9Vv" role="3clFbG">
                           <node concept="37vLTw" id="4uK_Ssze9Sx" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4uK_Ssze9Ka" resolve="sw" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Ah" resolve="sw" />
                           </node>
                           <node concept="1_qnLN" id="4uK_Sszeacp" role="2OqNvi">
                             <ref role="1_rbq0" to="bdcd:7U3Fobb_8Ej" resolve="SuppressAllWarnings" />
@@ -572,9 +572,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4uK_Ssze9Ka" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ah" role="1bW2Oz">
                       <property role="TrG5h" value="sw" />
-                      <node concept="2jxLKc" id="4uK_Ssze9Kb" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ai" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -598,7 +598,7 @@
                       <node concept="3clFbF" id="4uK_SszedtL" role="3cqZAp">
                         <node concept="2OqwBi" id="4uK_Sszedx5" role="3clFbG">
                           <node concept="37vLTw" id="4uK_SszedtK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4uK_SszedmI" resolve="sw" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Aj" resolve="sw" />
                           </node>
                           <node concept="1P9Npp" id="4uK_SszedVa" role="2OqNvi">
                             <node concept="2pJPEk" id="4uK_Sszee_H" role="1P9ThW">
@@ -609,7 +609,7 @@
                                   <node concept="36biLy" id="4uK_SszeeLv" role="28nt2d">
                                     <node concept="2OqwBi" id="4uK_SszeeS_" role="36biLW">
                                       <node concept="37vLTw" id="4uK_SszeeOq" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4uK_SszedmI" resolve="sw" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Aj" resolve="sw" />
                                       </node>
                                       <node concept="3Tsc0h" id="4uK_Sszef0G" role="2OqNvi">
                                         <ref role="3TtcxE" to="vs0r:4xqvipEHXGz" resolve="kinds" />
@@ -623,9 +623,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4uK_SszedmI" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Aj" role="1bW2Oz">
                       <property role="TrG5h" value="sw" />
-                      <node concept="2jxLKc" id="4uK_SszedmJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ak" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -36309,7 +36309,7 @@
                               <ref role="3TtcxE" to="vs0r:4WU0y9pWgVa" resolve="models_old" />
                             </node>
                             <node concept="37vLTw" id="7KCw61wnwS0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7KCw61wnwgY" resolve="loms" />
+                              <ref role="3cqZAo" node="2SR9xrsN1An" resolve="loms" />
                             </node>
                           </node>
                           <node concept="2es0OD" id="7KCw61wnACN" role="2OqNvi">
@@ -36329,7 +36329,7 @@
                                         <ref role="37wK5l" to="w1kc:~ModuleRepositoryFacade.getModelByName(java.lang.String)" resolve="getModelByName" />
                                         <node concept="2OqwBi" id="KHbkGQ3DJC" role="37wK5m">
                                           <node concept="37vLTw" id="KHbkGQ3DJD" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7KCw61wnACR" resolve="mre" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Al" resolve="mre" />
                                           </node>
                                           <node concept="2qgKlT" id="KHbkGQ3DJE" role="2OqNvi">
                                             <ref role="37wK5l" to="tpeu:7K4mn_BeEzv" resolve="getFQName" />
@@ -36345,7 +36345,7 @@
                                       <node concept="2OqwBi" id="7KCw61wnEun" role="3clFbG">
                                         <node concept="2OqwBi" id="7KCw61wnCcP" role="2Oq$k0">
                                           <node concept="37vLTw" id="7KCw61wnBXP" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7KCw61wnwgY" resolve="loms" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1An" resolve="loms" />
                                           </node>
                                           <node concept="3Tsc0h" id="wROT96T$17" role="2OqNvi">
                                             <ref role="3TtcxE" to="vs0r:wROT96SxP8" resolve="models" />
@@ -36372,7 +36372,7 @@
                                     <node concept="3clFbF" id="7KCw61wnHVi" role="3cqZAp">
                                       <node concept="2OqwBi" id="7KCw61wnIyq" role="3clFbG">
                                         <node concept="37vLTw" id="7KCw61wnHVg" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7KCw61wnACR" resolve="mre" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Al" resolve="mre" />
                                         </node>
                                         <node concept="3YRAZt" id="7KCw61wnJey" role="2OqNvi" />
                                       </node>
@@ -36386,18 +36386,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7KCw61wnACR" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Al" role="1bW2Oz">
                                 <property role="TrG5h" value="mre" />
-                                <node concept="2jxLKc" id="7KCw61wnACS" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Am" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7KCw61wnwgY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1An" role="1bW2Oz">
                       <property role="TrG5h" value="loms" />
-                      <node concept="2jxLKc" id="7KCw61wnwgZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ao" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -36456,7 +36456,7 @@
                         <node concept="3clFbF" id="KHbkGQ4b_c" role="3cqZAp">
                           <node concept="2OqwBi" id="KHbkGQ4bNc" role="3clFbG">
                             <node concept="37vLTw" id="KHbkGQ4b_b" role="2Oq$k0">
-                              <ref role="3cqZAo" node="KHbkGQ4bqV" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ap" resolve="it" />
                             </node>
                             <node concept="1BlSNk" id="KHbkGQ4c8o" role="2OqNvi">
                               <ref role="1BmUXE" to="vs0r:4WU0y9pWgP_" resolve="ListOfModelsScope" />
@@ -36465,9 +36465,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="KHbkGQ4bqV" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ap" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="KHbkGQ4bqW" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Aq" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -36489,7 +36489,7 @@
                                   <ref role="1Y3XeK" to="6f4m:4JdgAL_5vM9" resolve="NotMigratedNode" />
                                   <node concept="3Tm1VV" id="KHbkGQ4igR" role="1B3o_S" />
                                   <node concept="37vLTw" id="KHbkGQ4hg0" role="37wK5m">
-                                    <ref role="3cqZAo" node="KHbkGQ4cT0" resolve="mre" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Ar" resolve="mre" />
                                   </node>
                                   <node concept="3clFb_" id="KHbkGQ4iw1" role="jymVt">
                                     <property role="TrG5h" value="getMessage" />
@@ -36513,9 +36513,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="KHbkGQ4cT0" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ar" role="1bW2Oz">
                       <property role="TrG5h" value="mre" />
-                      <node concept="2jxLKc" id="KHbkGQ4cT1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1As" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/plugin.mps
index 1f1a4fb9eaf..1a2135ce751 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/scripts.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/scripts.mps
index 1a64108cbd1..c4077da45c7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/scripts.mps
@@ -55,7 +55,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps
index 8a82468077a..ce324ba3a71 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps
@@ -113,7 +113,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +127,7 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -141,6 +141,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -226,7 +227,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -243,7 +244,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -746,7 +746,7 @@
                         <node concept="3clFbF" id="2JIP8cA0DWU" role="3cqZAp">
                           <node concept="3cpWs3" id="2JIP8cA0DYq" role="3clFbG">
                             <node concept="37vLTw" id="2JIP8cA0DYt" role="3uHU7w">
-                              <ref role="3cqZAo" node="2JIP8cA0DWl" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1$l" resolve="it" />
                             </node>
                             <node concept="3cpWs3" id="2JIP8cA0DY2" role="3uHU7B">
                               <node concept="37vLTw" id="2JIP8cA0DXH" role="3uHU7B">
@@ -763,9 +763,9 @@
                         <property role="TrG5h" value="s" />
                         <node concept="17QB3L" id="2JIP8cA0DWT" role="1tU5fm" />
                       </node>
-                      <node concept="Rh6nW" id="2JIP8cA0DWl" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$l" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2JIP8cA0DWm" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$m" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="2JIP8cA0DWH" role="1MDeny">
@@ -859,7 +859,7 @@
                         <node concept="3clFbF" id="2JIP8cA0UcW" role="3cqZAp">
                           <node concept="3cpWs3" id="2JIP8cA0UcX" role="3clFbG">
                             <node concept="37vLTw" id="2JIP8cA0UcY" role="3uHU7w">
-                              <ref role="3cqZAo" node="2JIP8cA0Ud4" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1$n" resolve="it" />
                             </node>
                             <node concept="3cpWs3" id="2JIP8cA0UcZ" role="3uHU7B">
                               <node concept="37vLTw" id="2JIP8cA0Ud0" role="3uHU7B">
@@ -876,9 +876,9 @@
                         <property role="TrG5h" value="s" />
                         <node concept="17QB3L" id="2JIP8cA0Ud3" role="1tU5fm" />
                       </node>
-                      <node concept="Rh6nW" id="2JIP8cA0Ud4" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$n" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2JIP8cA0Ud5" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$o" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="2JIP8cA0Ud6" role="1MDeny">
@@ -908,6 +908,9 @@
     <property role="3GE5qa" value="documentation" />
     <property role="TrG5h" value="IIsDocumentationComment" />
     <property role="EcuMT" value="7534202261664852649" />
+    <node concept="PrWs8" id="4jmgM1fPF5$" role="PrDN$">
+      <ref role="PrY4T" to="tpck:3W5q5oTL9mp" resolve="IGenericComment" />
+    </node>
   </node>
   <node concept="PlHQZ" id="Ug1QzfhXN3">
     <property role="TrG5h" value="IEmpty" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/textGen.mps
index f7536ba8fdd..fb2af9fa0ca 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/textGen.mps
@@ -45,7 +45,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -79,7 +79,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
index 1b33f1cab2c..976bff1f0fa 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:1b0f275e-bd62-4f6e-8c4b-51b05d651a63(com.mbeddr.core.base.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
@@ -17,8 +17,10 @@
     <import index="gtp9" ref="r:007d0985-20e2-4d70-80f1-d0de1aff1076(com.mbeddr.mpsutil.common.graph)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
+    <import index="evo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.newTypesystem.context(MPS.Core/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="ev0w" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking.backend(MPS.Core/)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
   </imports>
   <registry>
@@ -30,9 +32,6 @@
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
-        <child id="1239714902950" name="expression" index="2$L3a6" />
-      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -49,9 +48,6 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
@@ -63,6 +59,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -80,9 +79,6 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
@@ -105,17 +101,15 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
@@ -126,18 +120,10 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
-      <concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
-        <child id="1144231399730" name="condition" index="1Dwp0S" />
-        <child id="1144231408325" name="iteration" index="1Dwrff" />
-      </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
         <child id="1163668914799" name="condition" index="3K4Cdx" />
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -147,18 +133,19 @@
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
         <property id="1200397540847" name="charConstant" index="1XhdNS" />
       </concept>
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-      </concept>
     </language>
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -279,18 +266,10 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -327,7 +306,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -374,7 +352,7 @@
                             <node concept="2OqwBi" id="79i$vAY5P49" role="3uHU7B">
                               <node concept="2yIwOk" id="79i$vAY5P4a" role="2OqNvi" />
                               <node concept="37vLTw" id="3R$6B6bKxFs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3R$6B6bKxFp" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1$p" resolve="it" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="79i$vAY5P4b" role="3uHU7w">
@@ -386,9 +364,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3R$6B6bKxFp" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$p" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3R$6B6bKxFq" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$q" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1139,7 +1117,7 @@
                 <node concept="3clFbF" id="2PGidvqimYy" role="3cqZAp">
                   <node concept="2OqwBi" id="2PGidvqimYS" role="3clFbG">
                     <node concept="37vLTw" id="2PGidvqimYz" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2PGidvqimYw" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN1$r" resolve="it" />
                     </node>
                     <node concept="2qgKlT" id="2PGidvqimYY" role="2OqNvi">
                       <ref role="37wK5l" to="hwgx:2PGidvqimWe" resolve="hasError" />
@@ -1147,9 +1125,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="2PGidvqimYw" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1$r" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="2PGidvqimYx" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1$s" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1350,7 +1328,7 @@
                           <node concept="2OqwBi" id="7ii2FhSPkbM" role="3clFbG">
                             <node concept="2OqwBi" id="7ii2FhSPkbN" role="2Oq$k0">
                               <node concept="37vLTw" id="7ii2FhSPkbO" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ii2FhSPkbU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1$t" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="7ii2FhSPkbP" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:2GIWVTRHLfj" resolve="getControlledName" />
@@ -1370,9 +1348,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7ii2FhSPkbU" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1$t" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7ii2FhSPkbV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1$u" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1519,155 +1497,232 @@
             <node concept="3oM_SD" id="7lAg7aDE0xF" role="1PaTwD">
               <property role="3oM_SC" value="TODO:" />
             </node>
-            <node concept="3oM_SD" id="7lAg7aDE2nR" role="1PaTwD">
-              <property role="3oM_SC" value="replace" />
-            </node>
-            <node concept="3oM_SD" id="7lAg7aDE2oG" role="1PaTwD">
+            <node concept="3oM_SD" id="30RNHFs19sd" role="1PaTwD">
               <property role="3oM_SC" value="deprecated" />
             </node>
             <node concept="3oM_SD" id="7lAg7aDE2p0" role="1PaTwD">
+              <property role="3oM_SC" value="TypeContextManager" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs19wm" role="1PaTwD">
               <property role="3oM_SC" value="API" />
             </node>
-            <node concept="3oM_SD" id="7lAg7aDE11i" role="1PaTwD">
-              <property role="3oM_SC" value="(checkRecursively()" />
+            <node concept="3oM_SD" id="30RNHFs19xM" role="1PaTwD">
+              <property role="3oM_SC" value="replaced" />
             </node>
-            <node concept="3oM_SD" id="7lAg7aDE139" role="1PaTwD">
-              <property role="3oM_SC" value="doesn't" />
+            <node concept="3oM_SD" id="30RNHFs19zf" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
             </node>
-            <node concept="3oM_SD" id="7lAg7aDE14n" role="1PaTwD">
-              <property role="3oM_SC" value="apply" />
+            <node concept="3oM_SD" id="30RNHFs19zC" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
             </node>
-            <node concept="3oM_SD" id="7lAg7aDE17r" role="1PaTwD">
-              <property role="3oM_SC" value="non-typesystem" />
+            <node concept="3oM_SD" id="30RNHFs19LT" role="1PaTwD">
+              <property role="3oM_SC" value="modern" />
             </node>
-            <node concept="3oM_SD" id="7lAg7aDE15X" role="1PaTwD">
-              <property role="3oM_SC" value="rules)" />
+            <node concept="3oM_SD" id="30RNHFs19Nj" role="1PaTwD">
+              <property role="3oM_SC" value="one," />
             </node>
-            <node concept="3oM_SD" id="7lAg7aDE0E1" role="1PaTwD">
-              <property role="3oM_SC" value="" />
+            <node concept="3oM_SD" id="30RNHFs19Pf" role="1PaTwD">
+              <property role="3oM_SC" value="need" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs19PR" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs19R6" role="1PaTwD">
+              <property role="3oM_SC" value="check" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs19RM" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="6sCGfm8seWS" role="3cqZAp">
-          <node concept="3cpWsn" id="6sCGfm8seWT" role="3cpWs9">
-            <property role="TrG5h" value="instance" />
-            <node concept="3uibUv" id="6sCGfm8seWU" role="1tU5fm">
-              <ref role="3uigEE" to="u78q:~TypeContextManager" resolve="TypeContextManager" />
+        <node concept="3SKdUt" id="30RNHFs19U7" role="3cqZAp">
+          <node concept="1PaTwC" id="30RNHFs19TR" role="1aUNEU">
+            <node concept="3oM_SD" id="30RNHFs19TQ" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1afx" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1afC" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1afL" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1afW" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1ag9" role="1PaTwD">
+              <property role="3oM_SC" value="direct" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1ar8" role="1PaTwD">
+              <property role="3oM_SC" value="use" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1aj8" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1alC" role="1PaTwD">
+              <property role="3oM_SC" value="HoleTypecheckingContext" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1auX" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
             </node>
-            <node concept="2YIFZM" id="6sCGfm8seWV" role="33vP2m">
-              <ref role="37wK5l" to="u78q:~TypeContextManager.getInstance()" resolve="getInstance" />
-              <ref role="1Pybhc" to="u78q:~TypeContextManager" resolve="TypeContextManager" />
+            <node concept="3oM_SD" id="30RNHFs1avi" role="1PaTwD">
+              <property role="3oM_SC" value="ok" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1avT" role="1PaTwD">
+              <property role="3oM_SC" value="(copied" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1az_" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1aFG" role="1PaTwD">
+              <property role="3oM_SC" value="" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="6sCGfm8seWW" role="3cqZAp">
-          <node concept="3cpWsn" id="6sCGfm8seWX" role="3cpWs9">
-            <property role="TrG5h" value="owner" />
-            <node concept="3uibUv" id="6sCGfm8seWY" role="1tU5fm">
-              <ref role="3uigEE" to="u78q:~DefaultTypecheckingContextOwner" resolve="DefaultTypecheckingContextOwner" />
-            </node>
-            <node concept="2ShNRf" id="6sCGfm8seWZ" role="33vP2m">
-              <node concept="1pGfFk" id="6sCGfm8seX0" role="2ShVmc">
-                <ref role="37wK5l" to="u78q:~DefaultTypecheckingContextOwner.&lt;init&gt;()" resolve="DefaultTypecheckingContextOwner" />
-              </node>
+        <node concept="3SKdUt" id="30RNHFs1aHw" role="3cqZAp">
+          <node concept="1PaTwC" id="30RNHFs1aHg" role="1aUNEU">
+            <node concept="3oM_SD" id="30RNHFs1aHf" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b5z" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b5U" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b63" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b6e" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b7b" role="1PaTwD">
+              <property role="3oM_SC" value="TypeContextManager.runTypecheckingAction()" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b0Q" role="1PaTwD">
+              <property role="3oM_SC" value="impl)" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b9n" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1b9C" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1bb1" role="1PaTwD">
+              <property role="3oM_SC" value="necessary" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1bcc" role="1PaTwD">
+              <property role="3oM_SC" value="rules" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1bdD" role="1PaTwD">
+              <property role="3oM_SC" value="(e.g." />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1be2" role="1PaTwD">
+              <property role="3oM_SC" value="non-ts)" />
             </node>
           </node>
         </node>
-        <node concept="1Dw8fO" id="6sCGfm8sgAf" role="3cqZAp">
-          <node concept="3clFbS" id="6sCGfm8sgAi" role="2LFqv$">
-            <node concept="3clFbF" id="6sCGfm8seX1" role="3cqZAp">
-              <node concept="2OqwBi" id="6sCGfm8seX2" role="3clFbG">
-                <node concept="37vLTw" id="6sCGfm8seX3" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6sCGfm8seWT" resolve="instance" />
-                </node>
-                <node concept="liA8E" id="6sCGfm8seX4" role="2OqNvi">
-                  <ref role="37wK5l" to="u78q:~TypeContextManager.runTypeCheckingAction(jetbrains.mps.typesystem.inference.ITypeContextOwner,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.ITypechecking$Action)" resolve="runTypeCheckingAction" />
-                  <node concept="37vLTw" id="6sCGfm8seX5" role="37wK5m">
-                    <ref role="3cqZAo" node="6sCGfm8seWX" resolve="owner" />
-                  </node>
-                  <node concept="37vLTw" id="6sCGfm8seX6" role="37wK5m">
-                    <ref role="3cqZAo" node="6sCGfm8seXn" resolve="root" />
-                  </node>
-                  <node concept="2ShNRf" id="6sCGfm8seX7" role="37wK5m">
-                    <node concept="YeOm9" id="6sCGfm8seX8" role="2ShVmc">
-                      <node concept="1Y3b0j" id="6sCGfm8seX9" role="YeSDq">
-                        <property role="2bfB8j" value="true" />
-                        <ref role="1Y3XeK" to="u78q:~ITypechecking$Action" resolve="ITypechecking.Action" />
-                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                        <node concept="3Tm1VV" id="6sCGfm8seXa" role="1B3o_S" />
-                        <node concept="3clFb_" id="6sCGfm8seXb" role="jymVt">
-                          <property role="1EzhhJ" value="false" />
-                          <property role="TrG5h" value="run" />
-                          <property role="DiZV1" value="false" />
-                          <node concept="3Tm1VV" id="6sCGfm8seXc" role="1B3o_S" />
-                          <node concept="3cqZAl" id="6sCGfm8seXd" role="3clF45" />
-                          <node concept="37vLTG" id="6sCGfm8seXe" role="3clF46">
-                            <property role="TrG5h" value="ctx" />
-                            <node concept="3uibUv" id="6sCGfm8seXf" role="1tU5fm">
-                              <ref role="3uigEE" to="u78q:~TypeCheckingContext" resolve="TypeCheckingContext" />
-                            </node>
-                          </node>
-                          <node concept="3clFbS" id="6sCGfm8seXg" role="3clF47">
-                            <node concept="3clFbF" id="6sCGfm8seXh" role="3cqZAp">
-                              <node concept="2OqwBi" id="6sCGfm8seXi" role="3clFbG">
-                                <node concept="37vLTw" id="6sCGfm8seXj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6sCGfm8seXe" resolve="ctx" />
-                                </node>
-                                <node concept="liA8E" id="6sCGfm8seXk" role="2OqNvi">
-                                  <ref role="37wK5l" to="u78q:~TypeCheckingContext.checkRoot()" resolve="checkRoot" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
+        <node concept="3SKdUt" id="30RNHFs1bwF" role="3cqZAp">
+          <node concept="1PaTwC" id="30RNHFs1bwG" role="1aUNEU">
+            <node concept="3oM_SD" id="30RNHFs1bzX" role="1PaTwD">
+              <property role="3oM_SC" value=" " />
             </node>
-          </node>
-          <node concept="3cpWsn" id="6sCGfm8sgAl" role="1Duv9x">
-            <property role="TrG5h" value="i" />
-            <node concept="10Oyi0" id="6sCGfm8sgIH" role="1tU5fm" />
-            <node concept="3cmrfG" id="6sCGfm8sgJk" role="33vP2m">
-              <property role="3cmrfH" value="0" />
+            <node concept="3oM_SD" id="30RNHFs1b$0" role="1PaTwD">
+              <property role="3oM_SC" value="" />
             </node>
-          </node>
-          <node concept="3eOVzh" id="6sCGfm8shv1" role="1Dwp0S">
-            <node concept="37vLTw" id="6sCGfm8shvb" role="3uHU7w">
-              <ref role="3cqZAo" node="6sCGfm8sf8w" resolve="c" />
+            <node concept="3oM_SD" id="30RNHFs1b$5" role="1PaTwD">
+              <property role="3oM_SC" value="" />
             </node>
-            <node concept="37vLTw" id="6sCGfm8sgJF" role="3uHU7B">
-              <ref role="3cqZAo" node="6sCGfm8sgAl" resolve="i" />
+            <node concept="3oM_SD" id="30RNHFs1b$c" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1bSa" role="1PaTwD">
+              <property role="3oM_SC" value="get" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1bS_" role="1PaTwD">
+              <property role="3oM_SC" value="activated" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1bTC" role="1PaTwD">
+              <property role="3oM_SC" value="as" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1bTR" role="1PaTwD">
+              <property role="3oM_SC" value="necessary" />
             </node>
           </node>
-          <node concept="3uNrnE" id="6sCGfm8sinM" role="1Dwrff">
-            <node concept="37vLTw" id="6sCGfm8sinO" role="2$L3a6">
-              <ref role="3cqZAo" node="6sCGfm8sgAl" resolve="i" />
+        </node>
+        <node concept="3cpWs8" id="30RNHFs0CVd" role="3cqZAp">
+          <node concept="3cpWsn" id="30RNHFs0CVe" role="3cpWs9">
+            <property role="TrG5h" value="tf" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="30RNHFs0COY" role="1tU5fm">
+              <ref role="3uigEE" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
+            </node>
+            <node concept="2YIFZM" id="30RNHFs0CVf" role="33vP2m">
+              <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
+              <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="7lAg7aDE0Q8" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="7lAg7aDDXAO" role="8Wnug">
-            <node concept="2OqwBi" id="7lAg7aDDXZT" role="3clFbG">
-              <node concept="2YIFZM" id="7lAg7aDDXJz" role="2Oq$k0">
-                <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
-                <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
-              </node>
-              <node concept="liA8E" id="7lAg7aDDYiT" role="2OqNvi">
-                <ref role="37wK5l" to="1ka:~TypecheckingFacade.checkRecursively(org.jetbrains.mps.openapi.model.SNode,java.util.function.Consumer)" resolve="checkRecursively" />
-                <node concept="37vLTw" id="7lAg7aDDYmb" role="37wK5m">
+        <node concept="3clFbF" id="30RNHFs0CGs" role="3cqZAp">
+          <node concept="2OqwBi" id="30RNHFs0Ei2" role="3clFbG">
+            <node concept="37vLTw" id="30RNHFs0CVg" role="2Oq$k0">
+              <ref role="3cqZAo" node="30RNHFs0CVe" resolve="tf" />
+            </node>
+            <node concept="liA8E" id="30RNHFs0Gyj" role="2OqNvi">
+              <ref role="37wK5l" to="ev0w:~TypecheckingSessionHandler.runIsolated(jetbrains.mps.typechecking.TypecheckingSession$Flags,java.util.function.Consumer)" resolve="runIsolated" />
+              <node concept="2YIFZM" id="30RNHFs0W_L" role="37wK5m">
+                <ref role="37wK5l" to="1ka:~TypecheckingSession$Flags.forRoot(org.jetbrains.mps.openapi.model.SNode)" resolve="forRoot" />
+                <ref role="1Pybhc" to="1ka:~TypecheckingSession$Flags" resolve="TypecheckingSession.Flags" />
+                <node concept="37vLTw" id="30RNHFs0WQ5" role="37wK5m">
                   <ref role="3cqZAo" node="6sCGfm8seXn" resolve="root" />
                 </node>
-                <node concept="1bVj0M" id="7lAg7aDDYvG" role="37wK5m">
-                  <node concept="3clFbS" id="7lAg7aDDYvI" role="1bW5cS" />
-                  <node concept="37vLTG" id="7lAg7aDE0Kt" role="1bW2Oz">
-                    <property role="TrG5h" value="item" />
-                    <node concept="3uibUv" id="7lAg7aDE0Ks" role="1tU5fm">
-                      <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+              </node>
+              <node concept="1bVj0M" id="30RNHFs0Uyw" role="37wK5m">
+                <node concept="37vLTG" id="30RNHFs0VAg" role="1bW2Oz">
+                  <property role="TrG5h" value="session" />
+                  <node concept="3uibUv" id="30RNHFs0VAd" role="1tU5fm">
+                    <ref role="3uigEE" to="1ka:~TypecheckingSession" resolve="TypecheckingSession" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="30RNHFs0UyK" role="1bW5cS">
+                  <node concept="3cpWs8" id="30RNHFs0XET" role="3cqZAp">
+                    <node concept="3cpWsn" id="30RNHFs0XEU" role="3cpWs9">
+                      <property role="TrG5h" value="th" />
+                      <node concept="3uibUv" id="30RNHFs0XEV" role="1tU5fm">
+                        <ref role="3uigEE" to="u78q:~TypeCheckerHelper" resolve="TypeCheckerHelper" />
+                      </node>
+                      <node concept="2OqwBi" id="30RNHFs0YSs" role="33vP2m">
+                        <node concept="37vLTw" id="30RNHFs0Yja" role="2Oq$k0">
+                          <ref role="3cqZAo" node="30RNHFs0VAg" resolve="session" />
+                        </node>
+                        <node concept="liA8E" id="30RNHFs0ZyN" role="2OqNvi">
+                          <ref role="37wK5l" to="1ka:~TypecheckingSession.getData(java.lang.Class)" resolve="getData" />
+                          <node concept="3VsKOn" id="30RNHFs0ZS9" role="37wK5m">
+                            <ref role="3VsUkX" to="u78q:~TypeCheckerHelper" resolve="TypeCheckerHelper" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="30RNHFs10$Y" role="3cqZAp">
+                    <node concept="2OqwBi" id="30RNHFs16_f" role="3clFbG">
+                      <node concept="2ShNRf" id="30RNHFs10$U" role="2Oq$k0">
+                        <node concept="1pGfFk" id="30RNHFs13fj" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="evo:~HoleTypecheckingContext.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.TypeCheckerHelper)" resolve="HoleTypecheckingContext" />
+                          <node concept="37vLTw" id="30RNHFs14fz" role="37wK5m">
+                            <ref role="3cqZAo" node="6sCGfm8seXn" resolve="root" />
+                          </node>
+                          <node concept="37vLTw" id="30RNHFs15$o" role="37wK5m">
+                            <ref role="3cqZAo" node="30RNHFs0XEU" resolve="th" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="30RNHFs17Mf" role="2OqNvi">
+                        <ref role="37wK5l" to="evo:~SimpleTypecheckingContext.checkRoot()" resolve="checkRoot" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1853,7 +1908,7 @@
                         <node concept="17QB3L" id="7XSydrbwJy" role="1tU5fm" />
                         <node concept="2OqwBi" id="7XSydrbwJQ" role="33vP2m">
                           <node concept="37vLTw" id="7XSydrbwJR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7XSydrbuqq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$v" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7XSydrbwJS" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:7XSydqUVwz" resolve="canImport" />
@@ -1891,9 +1946,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7XSydrbuqq" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1$v" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7XSydrbuqr" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1$w" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1918,7 +1973,7 @@
                         <node concept="17QB3L" id="7XSydrbDj6" role="1tU5fm" />
                         <node concept="2OqwBi" id="7XSydrbDj7" role="33vP2m">
                           <node concept="37vLTw" id="7XSydrbDj8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7XSydrbDjm" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1$x" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7XSydrbDj9" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:7XSydqUVyQ" resolve="canBeImported" />
@@ -1956,9 +2011,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7XSydrbDjm" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1$x" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7XSydrbDjn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1$y" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2117,16 +2172,16 @@
               <node concept="3clFbS" id="1aqla08PS8h" role="1bW5cS">
                 <node concept="2MkqsV" id="1aqla08PSbJ" role="3cqZAp">
                   <node concept="37vLTw" id="1aqla08PSjC" role="1urrMF">
-                    <ref role="3cqZAo" node="1aqla08PS8i" resolve="it" />
+                    <ref role="3cqZAo" node="2SR9xrsN1$z" resolve="it" />
                   </node>
                   <node concept="Xl_RD" id="1aqla08PSdY" role="2MkJ7o">
                     <property role="Xl_RC" value="This property is deprecated. Please use the new property or execute rerunnable migrations" />
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1aqla08PS8i" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1$z" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1aqla08PS8j" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1$$" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -2215,7 +2270,7 @@
                     <node concept="2OqwBi" id="3Fe92PR2XRg" role="3uHU7B">
                       <node concept="2OqwBi" id="3Fe92PR2Xwf" role="2Oq$k0">
                         <node concept="37vLTw" id="3Fe92PR2XoQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3Fe92PR38PR" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1$_" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3Fe92PR2XHR" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SReference.getTargetNodeReference()" resolve="getTargetNodeReference" />
@@ -2241,9 +2296,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="3Fe92PR38PR" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1$_" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="3Fe92PR38PS" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1$A" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/todo.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/todo.png
deleted file mode 100644
index 0ab13224947..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/todo.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 4ececd173ec..7f902e3cc47 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -3,12 +3,12 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1" name="com.mbeddr.mpsutil.spreferences" version="-1" />
@@ -121,10 +121,11 @@
     <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
     <import index="o2jy" ref="r:5a764b6f-e05f-4050-b22c-cbcad1577f1b(jetbrains.mps.ide.refactoring)" />
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
+    <import index="wvnl" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.extensions(MPS.Editor/)" />
     <import index="zyr2" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.inspector(MPS.Editor/)" />
     <import index="7oz1" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.configuration(MPS.Editor/)" />
-    <import index="wvnl" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.extensions(MPS.Editor/)" />
     <import index="mmaq" ref="f647e48e-4568-4f4c-b48a-1546492c6a2e/java:org.jdom(org.jdom/)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
     <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" implicit="true" />
   </imports>
   <registry>
@@ -147,6 +148,7 @@
         <property id="1207149998849" name="isAlwaysVisible" index="fJN8o" />
         <property id="1215865999894" name="mnemonic" index="ngHcd" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1227008813498" name="constructionParameter" index="2JrayB" />
@@ -573,6 +575,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -755,7 +758,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -784,1116 +786,6 @@
     </language>
   </registry>
   <node concept="2DaZZR" id="1ptFCtLqslV" />
-  <node concept="312cEu" id="58syclRv9F3">
-    <property role="TrG5h" value="MbeddrTodoFinder" />
-    <property role="3GE5qa" value="todoAndLOC" />
-    <node concept="3Tm1VV" id="58syclRv9F4" role="1B3o_S" />
-    <node concept="3uibUv" id="58syclRv9F9" role="EKbjA">
-      <ref role="3uigEE" to="k4i4:~IFinder" resolve="IFinder" />
-    </node>
-    <node concept="3clFbW" id="58syclRv9F5" role="jymVt">
-      <node concept="3cqZAl" id="58syclRv9F6" role="3clF45" />
-      <node concept="3Tm1VV" id="58syclRv9F7" role="1B3o_S" />
-      <node concept="3clFbS" id="58syclRv9F8" role="3clF47" />
-    </node>
-    <node concept="3clFb_" id="58syclRv9Fa" role="jymVt">
-      <property role="TrG5h" value="find" />
-      <node concept="3Tm1VV" id="58syclRv9Fb" role="1B3o_S" />
-      <node concept="3uibUv" id="58syclRv9Fc" role="3clF45">
-        <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
-      </node>
-      <node concept="37vLTG" id="58syclRv9Fd" role="3clF46">
-        <property role="TrG5h" value="query" />
-        <node concept="3uibUv" id="58syclRv9Fe" role="1tU5fm">
-          <ref role="3uigEE" to="9erk:~SearchQuery" resolve="SearchQuery" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="58syclRv9Ff" role="3clF46">
-        <property role="TrG5h" value="monitor" />
-        <node concept="3uibUv" id="5zgShfcdmA4" role="1tU5fm">
-          <ref role="3uigEE" to="yyf4:~ProgressMonitor" resolve="ProgressMonitor" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="58syclRv9Fh" role="3clF47">
-        <node concept="3clFbH" id="5zgShfcdckD" role="3cqZAp" />
-        <node concept="3clFbH" id="5zgShfcddl$" role="3cqZAp" />
-        <node concept="3cpWs8" id="58syclRv9Fi" role="3cqZAp">
-          <node concept="3cpWsn" id="58syclRv9Fj" role="3cpWs9">
-            <property role="TrG5h" value="nodes" />
-            <node concept="2hMVRd" id="gAudMcN6Wy" role="1tU5fm">
-              <node concept="3Tqbb2" id="gAudMcN6W$" role="2hN53Y" />
-            </node>
-            <node concept="2OqwBi" id="5zgShfcdgM7" role="33vP2m">
-              <node concept="2YIFZM" id="5zgShfcdg1F" role="2Oq$k0">
-                <ref role="37wK5l" to="lui2:~FindUsagesFacade.getInstance()" resolve="getInstance" />
-                <ref role="1Pybhc" to="lui2:~FindUsagesFacade" resolve="FindUsagesFacade" />
-              </node>
-              <node concept="liA8E" id="5zgShfcdinC" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~FindUsagesFacade.findInstances(org.jetbrains.mps.openapi.module.SearchScope,java.util.Set,boolean,org.jetbrains.mps.openapi.util.ProgressMonitor)" resolve="findInstances" />
-                <node concept="2OqwBi" id="5zgShfcdiyT" role="37wK5m">
-                  <node concept="37vLTw" id="5zgShfcdipL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="58syclRv9Fd" resolve="query" />
-                  </node>
-                  <node concept="liA8E" id="5zgShfcdjOr" role="2OqNvi">
-                    <ref role="37wK5l" to="9erk:~SearchQuery.getScope()" resolve="getScope" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="5zgShfcdkwt" role="37wK5m">
-                  <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                  <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
-                  <node concept="35c_gC" id="1KUALdKUidD" role="37wK5m">
-                    <ref role="35c_gD" to="vs0r:6yeRgC0uAED" resolve="IIsDocumentationComment" />
-                  </node>
-                </node>
-                <node concept="3clFbT" id="5zgShfcdjW_" role="37wK5m" />
-                <node concept="37vLTw" id="5zgShfcdk5C" role="37wK5m">
-                  <ref role="3cqZAo" node="58syclRv9Ff" resolve="monitor" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="58syclRv9Fv" role="3cqZAp">
-          <node concept="3cpWsn" id="58syclRv9Fw" role="3cpWs9">
-            <property role="TrG5h" value="results" />
-            <node concept="3uibUv" id="58syclRv9Fx" role="1tU5fm">
-              <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
-              <node concept="3Tqbb2" id="58syclRv9Fy" role="11_B2D" />
-            </node>
-            <node concept="2ShNRf" id="58syclRv9Fz" role="33vP2m">
-              <node concept="1pGfFk" id="58syclRv9F$" role="2ShVmc">
-                <ref role="37wK5l" to="9erk:~SearchResults.&lt;init&gt;()" resolve="SearchResults" />
-                <node concept="3Tqbb2" id="58syclRv9F_" role="1pMfVU" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2CEi94dyl50" role="3cqZAp" />
-        <node concept="3SKdUt" id="2CEi94dyng_" role="3cqZAp">
-          <node concept="1PaTwC" id="13p6s1wtiUw" role="1aUNEU">
-            <node concept="3oM_SD" id="13p6s1wtiUx" role="1PaTwD">
-              <property role="3oM_SC" value="TODO" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2mC7_5XOsBE" role="3cqZAp">
-          <node concept="3cpWsn" id="2mC7_5XOsBF" role="3cpWs9">
-            <property role="TrG5h" value="seq" />
-            <node concept="A3Dl8" id="2mC7_5XOsBt" role="1tU5fm">
-              <node concept="3uibUv" id="2mC7_5XOsBw" role="A3Ik2">
-                <ref role="3uigEE" to="9erk:~SearchResult" resolve="SearchResult" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="2mC7_5XOsBG" role="33vP2m">
-              <node concept="37vLTw" id="2mC7_5XOsBH" role="2Oq$k0">
-                <ref role="3cqZAo" node="58syclRv9Fj" resolve="nodes" />
-              </node>
-              <node concept="3$u5V9" id="2mC7_5XOsBI" role="2OqNvi">
-                <node concept="1bVj0M" id="2mC7_5XOsBJ" role="23t8la">
-                  <node concept="3clFbS" id="2mC7_5XOsBK" role="1bW5cS">
-                    <node concept="3cpWs8" id="2mC7_5XOsBL" role="3cqZAp">
-                      <node concept="3cpWsn" id="2mC7_5XOsBM" role="3cpWs9">
-                        <property role="TrG5h" value="result" />
-                        <node concept="3uibUv" id="2mC7_5XOsBN" role="1tU5fm">
-                          <ref role="3uigEE" to="9erk:~SearchResult" resolve="SearchResult" />
-                        </node>
-                        <node concept="2ShNRf" id="2mC7_5XOsBO" role="33vP2m">
-                          <node concept="1pGfFk" id="2mC7_5XOsBP" role="2ShVmc">
-                            <ref role="37wK5l" to="9erk:~SearchResult.&lt;init&gt;(java.lang.Object,java.lang.String)" resolve="SearchResult" />
-                            <node concept="3Tqbb2" id="2mC7_5XOsBQ" role="1pMfVU" />
-                            <node concept="37vLTw" id="2mC7_5XOsBR" role="37wK5m">
-                              <ref role="3cqZAo" node="2mC7_5XOsBV" resolve="it" />
-                            </node>
-                            <node concept="Xl_RD" id="2mC7_5XOsBS" role="37wK5m">
-                              <property role="Xl_RC" value="todo" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="2mC7_5XOsBT" role="3cqZAp">
-                      <node concept="37vLTw" id="2mC7_5XOsBU" role="3clFbG">
-                        <ref role="3cqZAo" node="2mC7_5XOsBM" resolve="result" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="2mC7_5XOsBV" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2mC7_5XOsBW" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7a98OvrOB39" role="3cqZAp">
-          <node concept="2OqwBi" id="7a98OvrOBio" role="3clFbG">
-            <node concept="37vLTw" id="7a98OvrOB37" role="2Oq$k0">
-              <ref role="3cqZAo" node="2mC7_5XOsBF" resolve="seq" />
-            </node>
-            <node concept="2es0OD" id="7a98OvrOCGE" role="2OqNvi">
-              <node concept="1bVj0M" id="7a98OvrOCGG" role="23t8la">
-                <node concept="3clFbS" id="7a98OvrOCGH" role="1bW5cS">
-                  <node concept="3clFbF" id="7a98OvrOCSd" role="3cqZAp">
-                    <node concept="2OqwBi" id="7a98OvrOCYs" role="3clFbG">
-                      <node concept="37vLTw" id="7a98OvrOCSc" role="2Oq$k0">
-                        <ref role="3cqZAo" node="58syclRv9Fw" resolve="results" />
-                      </node>
-                      <node concept="liA8E" id="7a98OvrODYA" role="2OqNvi">
-                        <ref role="37wK5l" to="9erk:~SearchResults.add(jetbrains.mps.ide.findusages.model.SearchResult)" resolve="add" />
-                        <node concept="37vLTw" id="7a98OvrOE2q" role="37wK5m">
-                          <ref role="3cqZAo" node="7a98OvrOCGI" resolve="it" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="7a98OvrOCGI" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7a98OvrOCGJ" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="58syclRv9Ga" role="3cqZAp">
-          <node concept="37vLTw" id="58syclRv9Gb" role="3cqZAk">
-            <ref role="3cqZAo" node="58syclRv9Fw" resolve="results" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="sEfby" id="4HeMkQiYObL">
-    <property role="TrG5h" value="MbeddrTodoViewer" />
-    <property role="2XNbzY" value="mbeddr TODO" />
-    <property role="3GE5qa" value="todoAndLOC" />
-    <node concept="2UmK3q" id="4HeMkQiYObM" role="2Um5zG">
-      <node concept="3clFbS" id="4HeMkQiYObN" role="2VODD2">
-        <node concept="1X3_iC" id="3AWqwDsogKt" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3cpWs6" id="4HeMkQiYObO" role="8Wnug">
-            <node concept="2OqwBi" id="4HeMkQiYObP" role="3cqZAk">
-              <node concept="2WthIp" id="4HeMkQiYObQ" role="2Oq$k0" />
-              <node concept="2BZ7hE" id="4HeMkQiYObR" role="2OqNvi">
-                <ref role="2WH_rO" node="4HeMkQiYObS" resolve="myComponent" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="50nt1yiYqED" role="3cqZAp">
-          <node concept="10Nm6u" id="50nt1yiYqNZ" role="3cqZAk" />
-        </node>
-      </node>
-    </node>
-    <node concept="2BZ0e9" id="4HeMkQiYObS" role="2XNbBz">
-      <property role="TrG5h" value="myComponent" />
-      <node concept="3Tm6S6" id="4HeMkQiYObT" role="1B3o_S" />
-      <node concept="3uibUv" id="4HeMkQiYObU" role="1tU5fm">
-        <ref role="3uigEE" node="4HeMkQiYPXp" resolve="MbedddrTodoViewer" />
-      </node>
-    </node>
-    <node concept="2xpIHi" id="4HeMkQiYObV" role="uR5cp">
-      <node concept="3clFbS" id="4HeMkQiYObW" role="2VODD2">
-        <node concept="1X3_iC" id="5GwePVE6$iR" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4HeMkQiYObX" role="8Wnug">
-            <node concept="37vLTI" id="4HeMkQiYObY" role="3clFbG">
-              <node concept="2OqwBi" id="4HeMkQiYObZ" role="37vLTJ">
-                <node concept="2WthIp" id="4HeMkQiYOc0" role="2Oq$k0" />
-                <node concept="2BZ7hE" id="4HeMkQiYOc1" role="2OqNvi">
-                  <ref role="2WH_rO" node="4HeMkQiYObS" resolve="myComponent" />
-                </node>
-              </node>
-              <node concept="2ShNRf" id="4HeMkQiYOc2" role="37vLTx">
-                <node concept="1pGfFk" id="4HeMkQiYOc3" role="2ShVmc">
-                  <ref role="37wK5l" node="4HeMkQiYPZB" resolve="MbedddrTodoViewer" />
-                  <node concept="2OqwBi" id="4HeMkQiYOc4" role="37wK5m">
-                    <node concept="2xqhHp" id="4HeMkQiYOc5" role="2Oq$k0" />
-                    <node concept="liA8E" id="4HeMkQiYOc6" role="2OqNvi">
-                      <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
-                      <node concept="3VsKOn" id="4HeMkQiYOc7" role="37wK5m">
-                        <ref role="3VsUkX" to="z1c4:~MPSProject" resolve="MPSProject" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2WthIp" id="4HeMkQiYOc8" role="37wK5m" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2xpOpl" id="4HeMkQiYOc9" role="uR5co">
-      <node concept="3clFbS" id="4HeMkQiYOca" role="2VODD2">
-        <node concept="1X3_iC" id="3AWqwDsokWl" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbJ" id="4mLQOETBve6" role="8Wnug">
-            <node concept="3clFbS" id="4mLQOETBve7" role="3clFbx">
-              <node concept="3cpWs6" id="4mLQOETBveQ" role="3cqZAp" />
-            </node>
-            <node concept="3clFbC" id="4mLQOETBveM" role="3clFbw">
-              <node concept="10Nm6u" id="4mLQOETBveP" role="3uHU7w" />
-              <node concept="2OqwBi" id="4mLQOETBver" role="3uHU7B">
-                <node concept="2WthIp" id="4mLQOETBvea" role="2Oq$k0" />
-                <node concept="2BZ7hE" id="4mLQOETBvew" role="2OqNvi">
-                  <ref role="2WH_rO" node="4HeMkQiYObS" resolve="myComponent" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="3AWqwDsokWm" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3cpWs8" id="4HeMkQiYOcb" role="8Wnug">
-            <node concept="3cpWsn" id="4HeMkQiYOcc" role="3cpWs9">
-              <property role="TrG5h" value="container" />
-              <node concept="3uibUv" id="4HeMkQiYOcd" role="1tU5fm">
-                <ref role="3uigEE" to="z60i:~Container" resolve="Container" />
-              </node>
-              <node concept="2OqwBi" id="4HeMkQiYOce" role="33vP2m">
-                <node concept="2OqwBi" id="4HeMkQiYOcf" role="2Oq$k0">
-                  <node concept="2WthIp" id="4HeMkQiYOcg" role="2Oq$k0" />
-                  <node concept="2BZ7hE" id="4HeMkQiYOch" role="2OqNvi">
-                    <ref role="2WH_rO" node="4HeMkQiYObS" resolve="myComponent" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="4HeMkQiYOci" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Component.getParent()" resolve="getParent" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="3AWqwDsokWn" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbJ" id="4HeMkQiYOcj" role="8Wnug">
-            <node concept="3clFbS" id="4HeMkQiYOck" role="3clFbx">
-              <node concept="3clFbF" id="4HeMkQiYOcl" role="3cqZAp">
-                <node concept="2OqwBi" id="4HeMkQiYOcm" role="3clFbG">
-                  <node concept="37vLTw" id="4HeMkQiYOcn" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4HeMkQiYOcc" resolve="container" />
-                  </node>
-                  <node concept="liA8E" id="4HeMkQiYOco" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Container.remove(java.awt.Component)" resolve="remove" />
-                    <node concept="2OqwBi" id="4HeMkQiYOcp" role="37wK5m">
-                      <node concept="2WthIp" id="4HeMkQiYOcq" role="2Oq$k0" />
-                      <node concept="2BZ7hE" id="4HeMkQiYOcr" role="2OqNvi">
-                        <ref role="2WH_rO" node="4HeMkQiYObS" resolve="myComponent" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3y3z36" id="4HeMkQiYOcs" role="3clFbw">
-              <node concept="10Nm6u" id="4HeMkQiYOct" role="3uHU7w" />
-              <node concept="37vLTw" id="5Hxjapwequc" role="3uHU7B">
-                <ref role="3cqZAo" node="4HeMkQiYOcc" resolve="container" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="3AWqwDsokWo" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4HeMkQiYOcv" role="8Wnug">
-            <node concept="2OqwBi" id="4HeMkQiYOcw" role="3clFbG">
-              <node concept="2OqwBi" id="4HeMkQiYOcx" role="2Oq$k0">
-                <node concept="2WthIp" id="4HeMkQiYOcy" role="2Oq$k0" />
-                <node concept="2BZ7hE" id="4HeMkQiYOcz" role="2OqNvi">
-                  <ref role="2WH_rO" node="4HeMkQiYObS" resolve="myComponent" />
-                </node>
-              </node>
-              <node concept="liA8E" id="4HeMkQiYOc$" role="2OqNvi">
-                <ref role="37wK5l" node="4HeMkQiYQ0r" resolve="dispose" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="3AWqwDsokWp" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4HeMkQiYOc_" role="8Wnug">
-            <node concept="37vLTI" id="4HeMkQiYOcA" role="3clFbG">
-              <node concept="10Nm6u" id="4HeMkQiYOcB" role="37vLTx" />
-              <node concept="2OqwBi" id="4HeMkQiYOcC" role="37vLTJ">
-                <node concept="2WthIp" id="4HeMkQiYOcD" role="2Oq$k0" />
-                <node concept="2BZ7hE" id="4HeMkQiYOcE" role="2OqNvi">
-                  <ref role="2WH_rO" node="4HeMkQiYObS" resolve="myComponent" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1QGGSu" id="4mLQOETBvpc" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/todo.png" />
-    </node>
-  </node>
-  <node concept="312cEu" id="4HeMkQiYPXp">
-    <property role="TrG5h" value="MbedddrTodoViewer" />
-    <property role="3GE5qa" value="todoAndLOC" />
-    <node concept="3Tm1VV" id="4HeMkQiYPXq" role="1B3o_S" />
-    <node concept="3uibUv" id="4HeMkQiYPXr" role="1zkMxy">
-      <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
-    </node>
-    <node concept="312cEg" id="4HeMkQiYPZl" role="jymVt">
-      <property role="TrG5h" value="myUsagesView" />
-      <node concept="3uibUv" id="4HeMkQiYPZm" role="1tU5fm">
-        <ref role="3uigEE" to="ngmn:~UsagesView" resolve="UsagesView" />
-      </node>
-      <node concept="3Tm6S6" id="4HeMkQiYPZn" role="1B3o_S" />
-    </node>
-    <node concept="312cEg" id="4HeMkQiYPZo" role="jymVt">
-      <property role="TrG5h" value="myProject" />
-      <node concept="3uibUv" id="4HeMkQiYPZp" role="1tU5fm">
-        <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-      </node>
-      <node concept="3Tm6S6" id="4HeMkQiYPZq" role="1B3o_S" />
-    </node>
-    <node concept="312cEg" id="4HeMkQiYPZr" role="jymVt">
-      <property role="TrG5h" value="myTool" />
-      <node concept="3Tm6S6" id="4HeMkQiYPZs" role="1B3o_S" />
-      <node concept="1xUVSX" id="4HeMkQiYPZt" role="1tU5fm">
-        <ref role="1xYkEM" node="4HeMkQiYObL" resolve="MbeddrTodoViewer" />
-      </node>
-    </node>
-    <node concept="3clFbW" id="4HeMkQiYPZB" role="jymVt">
-      <node concept="3Tm1VV" id="4HeMkQiYPZC" role="1B3o_S" />
-      <node concept="3cqZAl" id="4HeMkQiYPZD" role="3clF45" />
-      <node concept="37vLTG" id="4HeMkQiYPZE" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="4HeMkQiYPZF" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4HeMkQiYPZG" role="3clF46">
-        <property role="TrG5h" value="tool" />
-        <node concept="1xUVSX" id="4HeMkQiYPZH" role="1tU5fm">
-          <ref role="1xYkEM" node="4HeMkQiYObL" resolve="MbeddrTodoViewer" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4HeMkQiYPZI" role="3clF47">
-        <node concept="1X3_iC" id="3AWqwDsosC$" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="6Cv3uYsy0eg" role="8Wnug">
-            <node concept="2YIFZM" id="6Cv3uYsy0ei" role="3clFbG">
-              <ref role="37wK5l" to="dxuu:~SwingUtilities.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
-              <ref role="1Pybhc" to="dxuu:~SwingUtilities" resolve="SwingUtilities" />
-              <node concept="2ShNRf" id="6Cv3uYsy0ej" role="37wK5m">
-                <node concept="YeOm9" id="6Cv3uYsy0el" role="2ShVmc">
-                  <node concept="1Y3b0j" id="6Cv3uYsy0em" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
-                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <node concept="3Tm1VV" id="6Cv3uYsy0en" role="1B3o_S" />
-                    <node concept="3clFb_" id="6Cv3uYsy0eo" role="jymVt">
-                      <property role="1EzhhJ" value="false" />
-                      <property role="TrG5h" value="run" />
-                      <property role="DiZV1" value="false" />
-                      <node concept="3Tm1VV" id="6Cv3uYsy0ep" role="1B3o_S" />
-                      <node concept="3cqZAl" id="6Cv3uYsy0eq" role="3clF45" />
-                      <node concept="3clFbS" id="6Cv3uYsy0er" role="3clF47">
-                        <node concept="3clFbF" id="2XHM_LzKiRb" role="3cqZAp">
-                          <node concept="2OqwBi" id="2XHM_LzKj1o" role="3clFbG">
-                            <node concept="37vLTw" id="2XHM_LzKiR9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2XHM_LzIVM8" resolve="findAction" />
-                            </node>
-                            <node concept="liA8E" id="2XHM_LzKkw0" role="2OqNvi">
-                              <ref role="37wK5l" to="ngmn:~UsagesView$RerunAction.actionPerformed(com.intellij.openapi.actionSystem.AnActionEvent)" resolve="actionPerformed" />
-                              <node concept="2YIFZM" id="2XHM_LzKkIN" role="37wK5m">
-                                <ref role="37wK5l" to="qkt:~AnActionEvent.createFromInputEvent(com.intellij.openapi.actionSystem.AnAction,java.awt.event.InputEvent,java.lang.String)" resolve="createFromInputEvent" />
-                                <ref role="1Pybhc" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-                                <node concept="37vLTw" id="2XHM_LzKkMC" role="37wK5m">
-                                  <ref role="3cqZAo" node="2XHM_LzIVM8" resolve="findAction" />
-                                </node>
-                                <node concept="10Nm6u" id="2XHM_LzKkQw" role="37wK5m" />
-                                <node concept="10M0yZ" id="2XHM_LzKmKr" role="37wK5m">
-                                  <ref role="1PxDUh" to="qkt:~ActionPlaces" resolve="ActionPlaces" />
-                                  <ref role="3cqZAo" to="qkt:~ActionPlaces.UNKNOWN" resolve="UNKNOWN" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4HeMkQiYPZJ" role="3cqZAp">
-          <node concept="37vLTI" id="4HeMkQiYPZK" role="3clFbG">
-            <node concept="2OqwBi" id="4HeMkQiYPZL" role="37vLTJ">
-              <node concept="Xjq3P" id="4HeMkQiYPZM" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4HeMkQiYPZN" role="2OqNvi">
-                <ref role="2Oxat5" node="4HeMkQiYPZr" resolve="myTool" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="4HeMkQiYPZO" role="37vLTx">
-              <ref role="3cqZAo" node="4HeMkQiYPZG" resolve="tool" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4HeMkQiYPZP" role="3cqZAp">
-          <node concept="37vLTI" id="4HeMkQiYPZQ" role="3clFbG">
-            <node concept="37vLTw" id="4HeMkQiYPZR" role="37vLTJ">
-              <ref role="3cqZAo" node="4HeMkQiYPZo" resolve="myProject" />
-            </node>
-            <node concept="37vLTw" id="4HeMkQiYPZS" role="37vLTx">
-              <ref role="3cqZAo" node="4HeMkQiYPZE" resolve="mpsProject" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6Cv3uYsxZd2" role="3cqZAp">
-          <node concept="3P9mCS" id="6Cv3uYsxZd3" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager)" resolve="setLayout" />
-            <node concept="2ShNRf" id="6Cv3uYsxZd4" role="37wK5m">
-              <node concept="1pGfFk" id="6Cv3uYsxZd6" role="2ShVmc">
-                <ref role="37wK5l" to="z60i:~BorderLayout.&lt;init&gt;()" resolve="BorderLayout" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4Mx3AC_nbk_" role="3cqZAp">
-          <node concept="3cpWsn" id="4Mx3AC_nbkA" role="3cpWs9">
-            <property role="TrG5h" value="viewOptions" />
-            <node concept="3uibUv" id="4Mx3AC_nbkB" role="1tU5fm">
-              <ref role="3uigEE" to="dsdj:~ViewOptions" resolve="ViewOptions" />
-            </node>
-            <node concept="2ShNRf" id="4Mx3AC_nbkC" role="33vP2m">
-              <node concept="1pGfFk" id="4Mx3AC_nbkD" role="2ShVmc">
-                <ref role="37wK5l" to="dsdj:~ViewOptions.&lt;init&gt;(boolean,boolean,boolean,boolean,boolean)" resolve="ViewOptions" />
-                <node concept="3clFbT" id="4Mx3AC_nbkE" role="37wK5m">
-                  <property role="3clFbU" value="true" />
-                </node>
-                <node concept="3clFbT" id="4Mx3AC_nbkF" role="37wK5m" />
-                <node concept="3clFbT" id="4Mx3AC_nbkG" role="37wK5m" />
-                <node concept="3clFbT" id="4Mx3AC_nbkH" role="37wK5m" />
-                <node concept="3clFbT" id="4Mx3AC_nbkI" role="37wK5m" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4Mx3AC_nbkJ" role="3cqZAp">
-          <node concept="3cpWsn" id="4Mx3AC_nbkK" role="3cpWs9">
-            <property role="TrG5h" value="ideaProject" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="5zgShfc3FbD" role="1tU5fm">
-              <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-            </node>
-            <node concept="2YIFZM" id="4Mx3AC_nbkM" role="33vP2m">
-              <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <node concept="37vLTw" id="4Mx3AC_puG3" role="37wK5m">
-                <ref role="3cqZAo" node="4HeMkQiYPZE" resolve="mpsProject" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4Mx3AC_nbkO" role="3cqZAp">
-          <node concept="37vLTI" id="4Mx3AC_nbkP" role="3clFbG">
-            <node concept="37vLTw" id="4Mx3AC_nbkQ" role="37vLTJ">
-              <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-            </node>
-            <node concept="2ShNRf" id="4Mx3AC_nbkR" role="37vLTx">
-              <node concept="1pGfFk" id="2XHM_LzK5ya" role="2ShVmc">
-                <ref role="37wK5l" to="ngmn:~UsagesView.&lt;init&gt;(com.intellij.openapi.project.Project,jetbrains.mps.ide.findusages.view.treeholder.treeview.ViewOptions)" resolve="UsagesView" />
-                <node concept="37vLTw" id="4Mx3AC_nbkU" role="37wK5m">
-                  <ref role="3cqZAo" node="4Mx3AC_nbkK" resolve="ideaProject" />
-                </node>
-                <node concept="37vLTw" id="5HxjapweqxB" role="37wK5m">
-                  <ref role="3cqZAo" node="4Mx3AC_nbkA" resolve="viewOptions" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2XHM_LzIVM7" role="3cqZAp">
-          <node concept="3cpWsn" id="2XHM_LzIVM8" role="3cpWs9">
-            <property role="TrG5h" value="findAction" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="2XHM_LzIVM4" role="1tU5fm">
-              <ref role="3uigEE" to="ngmn:~UsagesView$RerunAction" resolve="UsagesView.RerunAction" />
-            </node>
-            <node concept="2ShNRf" id="2XHM_LzIVM9" role="33vP2m">
-              <node concept="1pGfFk" id="2XHM_LzIVMa" role="2ShVmc">
-                <ref role="37wK5l" to="ngmn:~UsagesView$RerunAction.&lt;init&gt;(jetbrains.mps.ide.findusages.view.UsagesView,java.lang.String)" resolve="UsagesView.RerunAction" />
-                <node concept="37vLTw" id="2XHM_LzIVMb" role="37wK5m">
-                  <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-                </node>
-                <node concept="Xl_RD" id="2XHM_LzIVMc" role="37wK5m">
-                  <property role="Xl_RC" value="Check again" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="yMODWLm3z5" role="3cqZAp">
-          <node concept="2OqwBi" id="yMODWLm4L9" role="3clFbG">
-            <node concept="37vLTw" id="yMODWLm3z3" role="2Oq$k0">
-              <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-            </node>
-            <node concept="liA8E" id="2XHM_LzHWNt" role="2OqNvi">
-              <ref role="37wK5l" to="ngmn:~UsagesView.setActions(com.intellij.openapi.actionSystem.AnAction...)" resolve="setActions" />
-              <node concept="37vLTw" id="2XHM_LzIVMd" role="37wK5m">
-                <ref role="3cqZAo" node="2XHM_LzIVM8" resolve="findAction" />
-              </node>
-              <node concept="2ShNRf" id="2XHM_LzIftH" role="37wK5m">
-                <node concept="1pGfFk" id="2XHM_LzISHr" role="2ShVmc">
-                  <ref role="37wK5l" to="ngmn:~UsagesView$RebuildAction.&lt;init&gt;(jetbrains.mps.ide.findusages.view.UsagesView)" resolve="UsagesView.RebuildAction" />
-                  <node concept="37vLTw" id="2XHM_LzISQ8" role="37wK5m">
-                    <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2ShNRf" id="2XHM_LzIX0d" role="37wK5m">
-                <node concept="YeOm9" id="2XHM_LzIYEc" role="2ShVmc">
-                  <node concept="1Y3b0j" id="2XHM_LzIYEf" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="1Y3XeK" to="qkt:~AnAction" resolve="AnAction" />
-                    <ref role="37wK5l" to="qkt:~AnAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="AnAction" />
-                    <node concept="3Tm1VV" id="2XHM_LzIYEg" role="1B3o_S" />
-                    <node concept="3clFb_" id="2XHM_LzIYEh" role="jymVt">
-                      <property role="1EzhhJ" value="false" />
-                      <property role="TrG5h" value="actionPerformed" />
-                      <property role="DiZV1" value="false" />
-                      <node concept="3Tm1VV" id="2XHM_LzIYEi" role="1B3o_S" />
-                      <node concept="3cqZAl" id="2XHM_LzIYEk" role="3clF45" />
-                      <node concept="37vLTG" id="2XHM_LzIYEl" role="3clF46">
-                        <property role="TrG5h" value="p0" />
-                        <node concept="3uibUv" id="2XHM_LzIYEm" role="1tU5fm">
-                          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-                        </node>
-                        <node concept="2AHcQZ" id="2XHM_LzIYEn" role="2AJF6D">
-                          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="2XHM_LzIYEo" role="3clF47">
-                        <node concept="3clFbF" id="4Mx3AC_nbkZ" role="3cqZAp">
-                          <node concept="2OqwBi" id="4Mx3AC_nbl0" role="3clFbG">
-                            <node concept="3P9mCS" id="4Mx3AC_nbl1" role="2Oq$k0">
-                              <ref role="37wK5l" node="4HeMkQiYQ0C" resolve="getTool" />
-                            </node>
-                            <node concept="liA8E" id="4Mx3AC_nbl2" role="2OqNvi">
-                              <ref role="37wK5l" to="71xd:~BaseTool.makeUnavailableLater()" resolve="makeUnavailableLater" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Xl_RD" id="2XHM_LzIZ3X" role="37wK5m">
-                      <property role="Xl_RC" value="Close" />
-                    </node>
-                    <node concept="Xl_RD" id="2XHM_LzIZzc" role="37wK5m">
-                      <property role="Xl_RC" value="" />
-                    </node>
-                    <node concept="10M0yZ" id="2XHM_LzK39F" role="37wK5m">
-                      <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
-                      <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Cancel" resolve="Cancel" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2ShNRf" id="2XHM_LzK5Ky" role="37wK5m">
-                <node concept="1pGfFk" id="2XHM_LzKae_" role="2ShVmc">
-                  <ref role="37wK5l" to="mklf:~PinToolwindowTabAction.&lt;init&gt;()" resolve="PinToolwindowTabAction" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2XHM_LzKbXe" role="3cqZAp">
-          <node concept="2OqwBi" id="2XHM_LzKc$z" role="3clFbG">
-            <node concept="37vLTw" id="2XHM_LzKbXc" role="2Oq$k0">
-              <ref role="3cqZAo" node="2XHM_LzIVM8" resolve="findAction" />
-            </node>
-            <node concept="liA8E" id="2XHM_LzKesC" role="2OqNvi">
-              <ref role="37wK5l" to="ngmn:~UsagesView$RerunAction.setRunOptions(jetbrains.mps.ide.findusages.model.IResultProvider,jetbrains.mps.ide.findusages.model.SearchQuery)" resolve="setRunOptions" />
-              <node concept="2YIFZM" id="4Mx3AC_nblf" role="37wK5m">
-                <ref role="1Pybhc" to="ngmm:~FindUtils" resolve="FindUtils" />
-                <ref role="37wK5l" to="ngmm:~FindUtils.makeProvider(jetbrains.mps.ide.findusages.findalgorithm.finders.IFinder...)" resolve="makeProvider" />
-                <node concept="2ShNRf" id="4Mx3AC_nblg" role="37wK5m">
-                  <node concept="1pGfFk" id="4Mx3AC_nblh" role="2ShVmc">
-                    <ref role="37wK5l" node="58syclRv9F5" resolve="MbeddrTodoFinder" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2ShNRf" id="4Mx3AC_nbli" role="37wK5m">
-                <node concept="1pGfFk" id="4Mx3AC_nblj" role="2ShVmc">
-                  <ref role="37wK5l" to="9erk:~SearchQuery.&lt;init&gt;(org.jetbrains.mps.openapi.module.SearchScope)" resolve="SearchQuery" />
-                  <node concept="2OqwBi" id="4Mx3AC_nblk" role="37wK5m">
-                    <node concept="37vLTw" id="4Mx3AC_nbll" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4HeMkQiYPZo" resolve="myProject" />
-                    </node>
-                    <node concept="liA8E" id="4Mx3AC_nblm" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4Mx3AC_nbls" role="3cqZAp">
-          <node concept="2OqwBi" id="4Mx3AC_nblt" role="3clFbG">
-            <node concept="37vLTw" id="4Mx3AC_nblu" role="2Oq$k0">
-              <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-            </node>
-            <node concept="liA8E" id="4Mx3AC_nblv" role="2OqNvi">
-              <ref role="37wK5l" to="ngmn:~UsagesView.setCustomNodeRepresentator(jetbrains.mps.ide.findusages.view.treeholder.treeview.INodeRepresentator)" resolve="setCustomNodeRepresentator" />
-              <node concept="2ShNRf" id="4Mx3AC_nblw" role="37wK5m">
-                <node concept="1pGfFk" id="4Mx3AC_nblx" role="2ShVmc">
-                  <ref role="37wK5l" node="4HeMkQiYPXw" resolve="MbedddrTodoViewer.MbeddrNodeRepresentator" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4Mx3AC_nbl5" role="3cqZAp">
-          <node concept="3P9mCS" id="4Mx3AC_nbl6" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
-            <node concept="2OqwBi" id="4Mx3AC_nbl7" role="37wK5m">
-              <node concept="37vLTw" id="4Mx3AC_nbl8" role="2Oq$k0">
-                <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-              </node>
-              <node concept="liA8E" id="4Mx3AC_nbl9" role="2OqNvi">
-                <ref role="37wK5l" to="ngmn:~UsagesView.getComponent()" resolve="getComponent" />
-              </node>
-            </node>
-            <node concept="10M0yZ" id="4Mx3AC_nbla" role="37wK5m">
-              <ref role="3cqZAo" to="z60i:~BorderLayout.CENTER" resolve="CENTER" />
-              <ref role="1PxDUh" to="z60i:~BorderLayout" resolve="BorderLayout" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3clFb_" id="4HeMkQiYQ0r" role="jymVt">
-      <property role="TrG5h" value="dispose" />
-      <node concept="3Tm1VV" id="4HeMkQiYQ0s" role="1B3o_S" />
-      <node concept="3cqZAl" id="4HeMkQiYQ0t" role="3clF45" />
-      <node concept="3clFbS" id="4HeMkQiYQ0u" role="3clF47">
-        <node concept="3clFbJ" id="4HeMkQiYQ0v" role="3cqZAp">
-          <node concept="3y3z36" id="4HeMkQiYQ0w" role="3clFbw">
-            <node concept="37vLTw" id="4HeMkQiYQ0x" role="3uHU7B">
-              <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-            </node>
-            <node concept="10Nm6u" id="4HeMkQiYQ0y" role="3uHU7w" />
-          </node>
-          <node concept="3clFbS" id="4HeMkQiYQ0z" role="3clFbx">
-            <node concept="3clFbF" id="4HeMkQiYQ0$" role="3cqZAp">
-              <node concept="2OqwBi" id="4HeMkQiYQ0_" role="3clFbG">
-                <node concept="37vLTw" id="4HeMkQiYQ0A" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4HeMkQiYPZl" resolve="myUsagesView" />
-                </node>
-                <node concept="liA8E" id="4HeMkQiYQ0B" role="2OqNvi">
-                  <ref role="37wK5l" to="ngmn:~UsagesView.dispose()" resolve="dispose" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3clFb_" id="4HeMkQiYQ0C" role="jymVt">
-      <property role="TrG5h" value="getTool" />
-      <node concept="3Tm6S6" id="4HeMkQiYQ0E" role="1B3o_S" />
-      <node concept="3clFbS" id="4HeMkQiYQ0F" role="3clF47">
-        <node concept="3cpWs6" id="4HeMkQiYQ0G" role="3cqZAp">
-          <node concept="2OqwBi" id="4HeMkQiYQ0H" role="3cqZAk">
-            <node concept="Xjq3P" id="4HeMkQiYQ0I" role="2Oq$k0" />
-            <node concept="2OwXpG" id="4HeMkQiYQ0J" role="2OqNvi">
-              <ref role="2Oxat5" node="4HeMkQiYPZr" resolve="myTool" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1xUVSX" id="3$nP$VrKLt7" role="3clF45">
-        <ref role="1xYkEM" node="4HeMkQiYObL" resolve="MbeddrTodoViewer" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="4HeMkQiYQ0K" role="jymVt">
-      <property role="TrG5h" value="getProject" />
-      <node concept="3uibUv" id="4HeMkQiYQ0L" role="3clF45">
-        <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-      </node>
-      <node concept="3Tm6S6" id="4HeMkQiYQ0M" role="1B3o_S" />
-      <node concept="3clFbS" id="4HeMkQiYQ0N" role="3clF47">
-        <node concept="3cpWs6" id="4HeMkQiYQ0O" role="3cqZAp">
-          <node concept="37vLTw" id="4HeMkQiYQ0P" role="3cqZAk">
-            <ref role="3cqZAo" node="4HeMkQiYPZo" resolve="myProject" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="312cEu" id="4HeMkQiYPXs" role="jymVt">
-      <property role="TrG5h" value="MbeddrNodeRepresentator" />
-      <node concept="3Tm1VV" id="4HeMkQiYPXt" role="1B3o_S" />
-      <node concept="3uibUv" id="4HeMkQiYPXu" role="EKbjA">
-        <ref role="3uigEE" to="dsdj:~INodeRepresentator" resolve="INodeRepresentator" />
-        <node concept="3uibUv" id="4HeMkQiYPXv" role="11_B2D">
-          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-        </node>
-      </node>
-      <node concept="3clFbW" id="4HeMkQiYPXw" role="jymVt">
-        <node concept="3Tm1VV" id="4HeMkQiYPXx" role="1B3o_S" />
-        <node concept="3cqZAl" id="4HeMkQiYPXy" role="3clF45" />
-        <node concept="3clFbS" id="4HeMkQiYPXz" role="3clF47" />
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPX$" role="jymVt">
-        <property role="TrG5h" value="getPresentation" />
-        <node concept="3Tm1VV" id="4HeMkQiYPX_" role="1B3o_S" />
-        <node concept="17QB3L" id="NOo8geR0Xh" role="3clF45" />
-        <node concept="37vLTG" id="4HeMkQiYPXB" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3uibUv" id="4HeMkQiYPXC" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPXD" role="3clF47">
-          <node concept="3cpWs6" id="4HeMkQiYPXE" role="3cqZAp">
-            <node concept="3cpWs3" id="4HeMkQiYPXF" role="3cqZAk">
-              <node concept="3cpWs3" id="8$8RMQPueo" role="3uHU7B">
-                <node concept="Xl_RD" id="2CEi94dzvYm" role="3uHU7w">
-                  <property role="Xl_RC" value="TODO" />
-                </node>
-                <node concept="Xl_RD" id="4HeMkQiYPXH" role="3uHU7B">
-                  <property role="Xl_RC" value="&lt;font color=blue&gt;" />
-                </node>
-              </node>
-              <node concept="Xl_RD" id="4HeMkQiYPXM" role="3uHU7w">
-                <property role="Xl_RC" value="&lt;/font&gt;" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="4HeMkQiYPXN" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPXO" role="jymVt">
-        <property role="TrG5h" value="getResultsText" />
-        <node concept="3Tm1VV" id="4HeMkQiYPXP" role="1B3o_S" />
-        <node concept="17QB3L" id="NOo8geR0Xl" role="3clF45" />
-        <node concept="37vLTG" id="4HeMkQiYPXR" role="3clF46">
-          <property role="TrG5h" value="options" />
-          <node concept="3uibUv" id="4HeMkQiYPXS" role="1tU5fm">
-            <ref role="3uigEE" to="gkle:~TextOptions" resolve="TextOptions" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPXT" role="3clF47">
-          <node concept="3cpWs6" id="4HeMkQiYPXU" role="3cqZAp">
-            <node concept="3cpWs3" id="4HeMkQiYPXV" role="3cqZAk">
-              <node concept="3cpWs3" id="4HeMkQiYPXW" role="3uHU7B">
-                <node concept="Xl_RD" id="4HeMkQiYPXX" role="3uHU7B">
-                  <property role="Xl_RC" value="&lt;strong&gt;" />
-                </node>
-                <node concept="2YIFZM" id="4HeMkQiYPXY" role="3uHU7w">
-                  <ref role="37wK5l" to="18ew:~NameUtil.formatNumericalString(int,java.lang.String)" resolve="formatNumericalString" />
-                  <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
-                  <node concept="2OqwBi" id="4HeMkQiYPXZ" role="37wK5m">
-                    <node concept="2OwXpG" id="4HeMkQiYPY0" role="2OqNvi">
-                      <ref role="2Oxat5" to="gkle:~TextOptions.mySubresultsCount" resolve="mySubresultsCount" />
-                    </node>
-                    <node concept="37vLTw" id="4HeMkQiYPY1" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4HeMkQiYPXR" resolve="options" />
-                    </node>
-                  </node>
-                  <node concept="Xl_RD" id="4HeMkQiYPY2" role="37wK5m">
-                    <property role="Xl_RC" value="TODO item" />
-                  </node>
-                </node>
-              </node>
-              <node concept="Xl_RD" id="4HeMkQiYPY3" role="3uHU7w">
-                <property role="Xl_RC" value=" found&lt;/strong&gt;" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPY4" role="jymVt">
-        <property role="TrG5h" value="getResultsIcon" />
-        <node concept="3Tm1VV" id="4HeMkQiYPY5" role="1B3o_S" />
-        <node concept="3uibUv" id="4HeMkQiYPY6" role="3clF45">
-          <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPY7" role="3clF47">
-          <node concept="3cpWs6" id="4HeMkQiYPY8" role="3cqZAp">
-            <node concept="10Nm6u" id="8$8RMQPuUy" role="3cqZAk" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPYa" role="jymVt">
-        <property role="TrG5h" value="getCategoryText" />
-        <node concept="3Tm1VV" id="4HeMkQiYPYb" role="1B3o_S" />
-        <node concept="17QB3L" id="NOo8geR0Xg" role="3clF45" />
-        <node concept="37vLTG" id="4HeMkQiYPYd" role="3clF46">
-          <property role="TrG5h" value="options" />
-          <node concept="3uibUv" id="4HeMkQiYPYe" role="1tU5fm">
-            <ref role="3uigEE" to="gkle:~TextOptions" resolve="TextOptions" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="4HeMkQiYPYf" role="3clF46">
-          <property role="TrG5h" value="category" />
-          <node concept="17QB3L" id="NOo8geR0Xi" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="4HeMkQiYPYh" role="3clF46">
-          <property role="TrG5h" value="isResultsSection" />
-          <node concept="10P_77" id="4HeMkQiYPYi" role="1tU5fm" />
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPYj" role="3clF47">
-          <node concept="3cpWs8" id="4HeMkQiYPYk" role="3cqZAp">
-            <node concept="3cpWsn" id="4HeMkQiYPYl" role="3cpWs9">
-              <property role="TrG5h" value="counter" />
-              <node concept="17QB3L" id="NOo8geR0Xj" role="1tU5fm" />
-              <node concept="Xl_RD" id="4HeMkQiYPYn" role="33vP2m">
-                <property role="Xl_RC" value="" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="4HeMkQiYPYo" role="3cqZAp">
-            <node concept="1Wc70l" id="4HeMkQiYPYp" role="3clFbw">
-              <node concept="2OqwBi" id="4HeMkQiYPYq" role="3uHU7B">
-                <node concept="2OwXpG" id="4HeMkQiYPYr" role="2OqNvi">
-                  <ref role="2Oxat5" to="gkle:~TextOptions.myCounters" resolve="myCounters" />
-                </node>
-                <node concept="37vLTw" id="4HeMkQiYPYs" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4HeMkQiYPYd" resolve="options" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="4HeMkQiYPYt" role="3uHU7w">
-                <ref role="3cqZAo" node="4HeMkQiYPYh" resolve="isResultsSection" />
-              </node>
-            </node>
-            <node concept="3clFbS" id="4HeMkQiYPYu" role="3clFbx">
-              <node concept="3cpWs8" id="4HeMkQiYPYv" role="3cqZAp">
-                <node concept="3cpWsn" id="4HeMkQiYPYw" role="3cpWs9">
-                  <property role="TrG5h" value="size" />
-                  <node concept="10Oyi0" id="4HeMkQiYPYx" role="1tU5fm" />
-                  <node concept="2OqwBi" id="4HeMkQiYPYy" role="33vP2m">
-                    <node concept="2OwXpG" id="4HeMkQiYPYz" role="2OqNvi">
-                      <ref role="2Oxat5" to="gkle:~TextOptions.mySubresultsCount" resolve="mySubresultsCount" />
-                    </node>
-                    <node concept="37vLTw" id="4HeMkQiYPY$" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4HeMkQiYPYd" resolve="options" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4HeMkQiYPY_" role="3cqZAp">
-                <node concept="37vLTI" id="4HeMkQiYPYA" role="3clFbG">
-                  <node concept="37vLTw" id="5HxjapwgGXv" role="37vLTJ">
-                    <ref role="3cqZAo" node="4HeMkQiYPYl" resolve="counter" />
-                  </node>
-                  <node concept="3cpWs3" id="4HeMkQiYPYC" role="37vLTx">
-                    <node concept="3cpWs3" id="4HeMkQiYPYD" role="3uHU7B">
-                      <node concept="Xl_RD" id="4HeMkQiYPYE" role="3uHU7B">
-                        <property role="Xl_RC" value=" (" />
-                      </node>
-                      <node concept="37vLTw" id="4HeMkQiYPYF" role="3uHU7w">
-                        <ref role="3cqZAo" node="4HeMkQiYPYw" resolve="size" />
-                      </node>
-                    </node>
-                    <node concept="Xl_RD" id="4HeMkQiYPYG" role="3uHU7w">
-                      <property role="Xl_RC" value=")" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs6" id="4HeMkQiYPYH" role="3cqZAp">
-            <node concept="3cpWs3" id="4HeMkQiYPYI" role="3cqZAk">
-              <node concept="3cpWs3" id="4HeMkQiYPYJ" role="3uHU7B">
-                <node concept="3cpWs3" id="8$8RMQQSY4" role="3uHU7B">
-                  <node concept="Xl_RD" id="8$8RMQQSY7" role="3uHU7w">
-                    <property role="Xl_RC" value=" " />
-                  </node>
-                  <node concept="3cpWs3" id="8$8RMQQSXK" role="3uHU7B">
-                    <node concept="Xl_RD" id="4HeMkQiYPYK" role="3uHU7B">
-                      <property role="Xl_RC" value="&lt;strong&gt;" />
-                    </node>
-                    <node concept="37vLTw" id="8$8RMQQSXN" role="3uHU7w">
-                      <ref role="3cqZAo" node="4HeMkQiYPYf" resolve="category" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="4HeMkQiYPYL" role="3uHU7w">
-                  <ref role="3cqZAo" node="4HeMkQiYPYl" resolve="counter" />
-                </node>
-              </node>
-              <node concept="Xl_RD" id="4HeMkQiYPYM" role="3uHU7w">
-                <property role="Xl_RC" value="&lt;/strong&gt;" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPYN" role="jymVt">
-        <property role="TrG5h" value="getCategoryIcon" />
-        <node concept="3Tm1VV" id="4HeMkQiYPYO" role="1B3o_S" />
-        <node concept="3uibUv" id="4HeMkQiYPYP" role="3clF45">
-          <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
-        </node>
-        <node concept="37vLTG" id="4HeMkQiYPYQ" role="3clF46">
-          <property role="TrG5h" value="category" />
-          <node concept="17QB3L" id="NOo8geR0Xk" role="1tU5fm" />
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPYS" role="3clF47">
-          <node concept="3cpWs6" id="4HeMkQiYPYT" role="3cqZAp">
-            <node concept="10M0yZ" id="4HeMkQiYPYU" role="3cqZAk">
-              <ref role="3cqZAo" to="xnls:~IdeIcons.CLOSED_FOLDER" resolve="CLOSED_FOLDER" />
-              <ref role="1PxDUh" to="xnls:~IdeIcons" resolve="IdeIcons" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPYV" role="jymVt">
-        <property role="TrG5h" value="getCategoryKinds" />
-        <node concept="3Tm1VV" id="4HeMkQiYPYW" role="1B3o_S" />
-        <node concept="3uibUv" id="4HeMkQiYPYX" role="3clF45">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="4HeMkQiYPYY" role="11_B2D">
-            <ref role="3uigEE" to="9erk:~CategoryKind" resolve="CategoryKind" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPYZ" role="3clF47">
-          <node concept="3cpWs6" id="4HeMkQiYPZ0" role="3cqZAp">
-            <node concept="2YIFZM" id="4HeMkQiYPZ1" role="3cqZAk">
-              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
-              <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-              <node concept="10M0yZ" id="4HeMkQiYPZ2" role="37wK5m">
-                <ref role="1PxDUh" to="9erk:~CategoryKind" resolve="CategoryKind" />
-                <ref role="3cqZAo" to="9erk:~CategoryKind.DEFAULT_CATEGORY_KIND" resolve="DEFAULT_CATEGORY_KIND" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPZ3" role="jymVt">
-        <property role="TrG5h" value="read" />
-        <node concept="3Tm1VV" id="4HeMkQiYPZ4" role="1B3o_S" />
-        <node concept="3cqZAl" id="4HeMkQiYPZ5" role="3clF45" />
-        <node concept="37vLTG" id="4HeMkQiYPZ6" role="3clF46">
-          <property role="TrG5h" value="element" />
-          <node concept="3uibUv" id="4HeMkQiYPZ7" role="1tU5fm">
-            <ref role="3uigEE" to="mmaq:~Element" resolve="Element" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="4HeMkQiYPZ8" role="3clF46">
-          <property role="TrG5h" value="project" />
-          <node concept="3uibUv" id="4HeMkQiYPZ9" role="1tU5fm">
-            <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPZa" role="3clF47" />
-        <node concept="3uibUv" id="4HeMkQiYPZb" role="Sfmx6">
-          <ref role="3uigEE" to="ogzp:~CantLoadSomethingException" resolve="CantLoadSomethingException" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="4HeMkQiYPZc" role="jymVt">
-        <property role="TrG5h" value="write" />
-        <node concept="3Tm1VV" id="4HeMkQiYPZd" role="1B3o_S" />
-        <node concept="3cqZAl" id="4HeMkQiYPZe" role="3clF45" />
-        <node concept="37vLTG" id="4HeMkQiYPZf" role="3clF46">
-          <property role="TrG5h" value="element" />
-          <node concept="3uibUv" id="4HeMkQiYPZg" role="1tU5fm">
-            <ref role="3uigEE" to="mmaq:~Element" resolve="Element" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="4HeMkQiYPZh" role="3clF46">
-          <property role="TrG5h" value="project" />
-          <node concept="3uibUv" id="4HeMkQiYPZi" role="1tU5fm">
-            <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4HeMkQiYPZj" role="3clF47" />
-        <node concept="3uibUv" id="4HeMkQiYPZk" role="Sfmx6">
-          <ref role="3uigEE" to="ogzp:~CantSaveSomethingException" resolve="CantSaveSomethingException" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="sE7Ow" id="4mLQOETAgfw">
-    <property role="3GE5qa" value="todoAndLOC" />
-    <property role="TrG5h" value="OpenMbeddrTodoAction" />
-    <property role="2uzpH1" value="mbeddr TODO" />
-    <node concept="1DS2jV" id="4LxknRuFKrb" role="1NuT2Z">
-      <property role="TrG5h" value="project" />
-      <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
-    </node>
-    <node concept="tnohg" id="4mLQOETAgfx" role="tncku">
-      <node concept="3clFbS" id="4mLQOETAgfy" role="2VODD2">
-        <node concept="1X3_iC" id="3AWqwDsosIv" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3cpWs8" id="4LxknRuFKqr" role="8Wnug">
-            <node concept="3cpWsn" id="4LxknRuFKqs" role="3cpWs9">
-              <property role="TrG5h" value="graphViewer" />
-              <node concept="1xUVSX" id="4LxknRuFKqt" role="1tU5fm">
-                <ref role="1xYkEM" node="4HeMkQiYObL" resolve="MbeddrTodoViewer" />
-              </node>
-              <node concept="2OqwBi" id="4LxknRuFKqu" role="33vP2m">
-                <node concept="2OqwBi" id="4LxknRuFKqv" role="2Oq$k0">
-                  <node concept="2WthIp" id="4LxknRuFKqw" role="2Oq$k0" />
-                  <node concept="1DTwFV" id="4LxknRuFKqx" role="2OqNvi">
-                    <ref role="2WH_rO" node="4LxknRuFKrb" resolve="project" />
-                  </node>
-                </node>
-                <node concept="LR4U6" id="4LxknRuFKqy" role="2OqNvi">
-                  <ref role="LR4U5" node="4HeMkQiYObL" resolve="MbeddrTodoViewer" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="3AWqwDsosIw" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4LxknRuFKr5" role="8Wnug">
-            <node concept="2OqwBi" id="4LxknRuFKr6" role="3clFbG">
-              <node concept="37vLTw" id="5HxjapweqEc" role="2Oq$k0">
-                <ref role="3cqZAo" node="4LxknRuFKqs" resolve="graphViewer" />
-              </node>
-              <node concept="liA8E" id="4LxknRuFKr8" role="2OqNvi">
-                <ref role="37wK5l" to="71xd:~BaseTool.openTool(boolean)" resolve="openTool" />
-                <node concept="3clFbT" id="4LxknRuFKr9" role="37wK5m">
-                  <property role="3clFbU" value="true" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1QGGSu" id="4mLQOETBvpe" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/todo.png" />
-    </node>
-  </node>
-  <node concept="tC5Ba" id="4mLQOETAgfJ">
-    <property role="3GE5qa" value="todoAndLOC" />
-    <property role="TrG5h" value="MbeddrTODOGroup" />
-    <node concept="ftmFs" id="4mLQOETAgfL" role="ftER_">
-      <node concept="2a7GMi" id="2alRA69Tl8$" role="ftvYc" />
-    </node>
-    <node concept="tT9cl" id="4mLQOETAgfN" role="2f5YQi">
-      <ref role="tU$_T" to="tprs:hyf4LYI" resolve="Tools" />
-      <ref role="2f8Tey" to="tprs:hHYwqIT" resolve="customTools" />
-    </node>
-  </node>
   <node concept="sE7Ow" id="1DVNPtFPBaz">
     <property role="TrG5h" value="ShowOutline" />
     <property role="2uzpH1" value="Show Outline" />
@@ -1977,7 +869,7 @@
                               <node concept="3fqX7Q" id="1DVNPtFPYfw" role="3clFbG">
                                 <node concept="2OqwBi" id="1DVNPtFPYfN" role="3fr31v">
                                   <node concept="37vLTw" id="1DVNPtFPYfy" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1DVNPtFPYft" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2$e" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="1DVNPtFPYfT" role="2OqNvi">
                                     <node concept="chp4Y" id="1DVNPtFPYfV" role="cj9EA">
@@ -1988,9 +880,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1DVNPtFPYft" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2$e" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1DVNPtFPYfu" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2$f" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2001,7 +893,7 @@
                           <node concept="3clFbF" id="3il$LAnSa4m" role="3cqZAp">
                             <node concept="2OqwBi" id="3il$LAnSa9D" role="3clFbG">
                               <node concept="37vLTw" id="3il$LAnSa4l" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3il$LAnRNmZ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2$g" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="3il$LAnSaVG" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:3il$LAnRN_V" resolve="actuallyShowInOutline" />
@@ -2009,9 +901,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3il$LAnRNmZ" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2$g" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3il$LAnRNn0" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2$h" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2043,7 +935,7 @@
                                 <node concept="2OqwBi" id="5zgShfcdJ7q" role="3clFbG">
                                   <node concept="2JrnkZ" id="5zgShfcdIkB" role="2Oq$k0">
                                     <node concept="37vLTw" id="5zgShfcdHs3" role="2JrQYb">
-                                      <ref role="3cqZAo" node="5zgShfcdGMm" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2$i" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5zgShfcdKlF" role="2OqNvi">
@@ -2052,9 +944,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5zgShfcdGMm" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2$i" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5zgShfcdGMn" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2$j" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2208,6 +1100,7 @@
     <property role="2uzpH1" value="Terminal in Module Folder" />
     <property role="3GE5qa" value="terminal" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="7uLL3Mf2tAq" role="tncku">
       <node concept="3clFbS" id="7uLL3Mf2tAr" role="2VODD2">
         <node concept="3cpWs8" id="7uLL3Mf2DgK" role="3cqZAp">
@@ -2297,6 +1190,7 @@
     <property role="TrG5h" value="openTerminalForModelOutput" />
     <property role="2uzpH1" value="Terminal in Output Folder" />
     <property role="3GE5qa" value="terminal" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="DMIuLumKyB" role="32lrUH">
       <property role="TrG5h" value="getOutputPath" />
       <node concept="3clFbS" id="DMIuLumKyC" role="3clF47">
@@ -4935,6 +3829,7 @@
     <property role="3GE5qa" value="search" />
     <property role="TrG5h" value="OpenSearchActionOnModel" />
     <property role="2uzpH1" value="Search Model" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="2HzhasNzPvh" role="1NuT2Z">
       <property role="TrG5h" value="model" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODEL" resolve="MODEL" />
@@ -7088,6 +5983,7 @@
     <property role="3GE5qa" value="assessment" />
     <property role="TrG5h" value="UpdateAssessments" />
     <property role="2uzpH1" value="Update Assessments" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="3jNX2XuMqyM" role="1NuT2Z">
       <property role="TrG5h" value="model" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODEL" resolve="MODEL" />
@@ -7135,7 +6031,7 @@
                   <node concept="3clFbF" id="3jNX2XuMqRo" role="3cqZAp">
                     <node concept="2OqwBi" id="3jNX2XuMqRI" role="3clFbG">
                       <node concept="37vLTw" id="3jNX2XuMqRp" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3jNX2XuMqRm" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2$k" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3jNX2XuMqRO" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:3jNX2XuLy_p" resolve="update" />
@@ -7143,9 +6039,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3jNX2XuMqRm" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2$k" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3jNX2XuMqRn" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2$l" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7934,7 +6830,7 @@
                             <ref role="37wK5l" to="18ew:~NameUtil.compactNamespace(java.lang.String)" resolve="compactNamespace" />
                             <node concept="2OqwBi" id="3O27jEA5NpQ" role="37wK5m">
                               <node concept="37vLTw" id="3O27jEA5PE4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4augEjZSSqf" resolve="lang" />
+                                <ref role="3cqZAo" node="2SR9xrsN2$o" resolve="lang" />
                               </node>
                               <node concept="liA8E" id="3O27jEA5Qsi" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
@@ -8167,7 +7063,7 @@
                                   <ref role="3cqZAo" node="5Ckw_BK$N9f" resolve="rootNodesByCategory" />
                                 </node>
                                 <node concept="liA8E" id="6d0zIQxfWUP" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
+                                  <ref role="37wK5l" to="33ny:~TreeMap.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
                                   <node concept="37vLTw" id="6d0zIQxfXYd" role="37wK5m">
                                     <ref role="3cqZAo" node="4augEjZSVuG" resolve="category" />
                                   </node>
@@ -8279,7 +7175,7 @@
                           </node>
                           <node concept="2OqwBi" id="3eR6wocIJIq" role="10QFUP">
                             <node concept="37vLTw" id="3eR6wocIJuM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4augEjZSSqf" resolve="lang" />
+                              <ref role="3cqZAo" node="2SR9xrsN2$o" resolve="lang" />
                             </node>
                             <node concept="liA8E" id="3eR6wocIJTa" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SLanguage.getConcepts()" resolve="getConcepts" />
@@ -8295,7 +7191,7 @@
                                 <node concept="3fqX7Q" id="1hbr9aMJeXH" role="3uHU7w">
                                   <node concept="2OqwBi" id="1hbr9aMJgbR" role="3fr31v">
                                     <node concept="37vLTw" id="1hbr9aMJf4w" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4augEjZSVvQ" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2$m" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="1hbr9aMJhn7" role="2OqNvi">
                                       <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -8304,13 +7200,13 @@
                                 </node>
                                 <node concept="2OqwBi" id="6g_o1CJDXKQ" role="3uHU7B">
                                   <node concept="2YIFZM" id="6g_o1CJDWBz" role="2Oq$k0">
-                                    <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeRoot(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeRootContext)" resolve="checkCanBeRoot" />
-                                    <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                                    <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeRoot(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeRootContext)" resolve="checkCanBeRoot" />
+                                    <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                                     <node concept="2ShNRf" id="6g_o1CJDWB$" role="37wK5m">
                                       <node concept="1pGfFk" id="6g_o1CJDWB_" role="2ShVmc">
                                         <ref role="37wK5l" to="pdwk:~CanBeRootContext.&lt;init&gt;(org.jetbrains.mps.openapi.language.SAbstractConcept,org.jetbrains.mps.openapi.model.SModel)" resolve="CanBeRootContext" />
                                         <node concept="37vLTw" id="6g_o1CJDWBA" role="37wK5m">
-                                          <ref role="3cqZAo" node="4augEjZSVvQ" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2$m" resolve="it" />
                                         </node>
                                         <node concept="37vLTw" id="6g_o1CJDWBB" role="37wK5m">
                                           <ref role="3cqZAo" node="1PMOMKdiLEH" resolve="model" />
@@ -8325,9 +7221,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4augEjZSVvQ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2$m" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4augEjZSVvR" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2$n" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -8365,9 +7261,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4augEjZSSqf" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2$o" role="1bW2Oz">
                   <property role="TrG5h" value="lang" />
-                  <node concept="2jxLKc" id="4augEjZSSqg" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2$p" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8639,6 +7535,7 @@
     <property role="TrG5h" value="CreateMbeddrModel" />
     <property role="2uzpH1" value="New model" />
     <property role="72QZ$" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="16oY6Yuy2BQ" role="tncku">
       <node concept="3clFbS" id="16oY6Yuy2BR" role="2VODD2">
         <node concept="3clFbH" id="79AXByy$URw" role="3cqZAp" />
@@ -10876,15 +9773,15 @@
                           <node concept="liA8E" id="7o1blyuBD10" role="2OqNvi">
                             <ref role="37wK5l" to="fyhk:~VisibleModuleRegistry.isVisible(org.jetbrains.mps.openapi.module.SModule)" resolve="isVisible" />
                             <node concept="37vLTw" id="7o1blyuBD3v" role="37wK5m">
-                              <ref role="3cqZAo" node="7o1blyuBC57" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2$q" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7o1blyuBC57" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2$q" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7o1blyuBC58" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2$r" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10900,15 +9797,15 @@
                         <node concept="liA8E" id="7o1blyuBG$T" role="2OqNvi">
                           <ref role="37wK5l" node="2qDF1txKjM_" resolve="filter" />
                           <node concept="37vLTw" id="7o1blyuBGEE" role="37wK5m">
-                            <ref role="3cqZAo" node="7o1blyuBFfv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2$s" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7o1blyuBFfv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2$s" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7o1blyuBFfw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2$t" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10920,14 +9817,14 @@
                     <node concept="1rXfSq" id="7o1blyuBNob" role="3clFbG">
                       <ref role="37wK5l" node="23GX$R901U" resolve="addDevKit" />
                       <node concept="37vLTw" id="7o1blyuBNvs" role="37wK5m">
-                        <ref role="3cqZAo" node="7o1blyuBN7F" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2$u" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7o1blyuBN7F" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2$u" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7o1blyuBN7G" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2$v" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -13660,6 +12557,7 @@
     <property role="3GE5qa" value="search" />
     <property role="TrG5h" value="OpenSearchActionOnSolution" />
     <property role="2uzpH1" value="Search Solution" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="2Gn1WTgS$Ia" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -17594,6 +16492,7 @@
     <property role="2uzpH1" value="Show Tree View" />
     <property role="ngHcd" value="T" />
     <property role="3GE5qa" value="tree" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="7Q6Q5uyyekd" role="tncku">
       <node concept="3clFbS" id="7Q6Q5uyyeke" role="2VODD2">
         <node concept="3cpWs8" id="2bPPn51AYos" role="3cqZAp">
@@ -17936,6 +16835,7 @@
     <property role="TrG5h" value="OpenGenericTreeToolParametrized" />
     <property role="2uzpH1" value="Show Tree View ..." />
     <property role="3GE5qa" value="tree" />
+    <property role="1rBW0U" value="true" />
     <node concept="2JriF1" id="bhVSeFXeBD" role="2JrayB">
       <property role="TrG5h" value="cat" />
       <node concept="3Tm6S6" id="bhVSeFXeBE" role="1B3o_S" />
@@ -18285,6 +17185,7 @@
     <property role="2uzpH1" value="Show Tree View" />
     <property role="ngHcd" value="T" />
     <property role="3GE5qa" value="tree" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="6AXckLE9yw3" role="1NuT2Z">
       <property role="TrG5h" value="window" />
       <ref role="1DUlNI" to="qkt:~PlatformDataKeys.TOOL_WINDOW" resolve="TOOL_WINDOW" />
@@ -18822,7 +17723,7 @@
                         <node concept="1eOMI4" id="2nGuY2QRTH9" role="2Oq$k0">
                           <node concept="10QFUN" id="2nGuY2QRTHa" role="1eOMHV">
                             <node concept="37vLTw" id="2nGuY2QRTHb" role="10QFUP">
-                              <ref role="3cqZAo" node="2nGuY2QRTHe" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2$w" resolve="it" />
                             </node>
                             <node concept="H_c77" id="2nGuY2QRTHc" role="10QFUM" />
                           </node>
@@ -18831,9 +17732,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2nGuY2QRTHe" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2$w" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2nGuY2QRTHf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2$x" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -18854,15 +17755,15 @@
                     <node concept="3clFbF" id="2nGuY2QS1kC" role="3cqZAp">
                       <node concept="2OqwBi" id="2nGuY2QS1kD" role="3clFbG">
                         <node concept="37vLTw" id="2nGuY2QS1kE" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2nGuY2QS1kG" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2$y" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="4yCyDr3if2c" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2nGuY2QS1kG" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2$y" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2nGuY2QS1kH" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2$z" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -18932,20 +17833,20 @@
                                                                     <node concept="3clFbF" id="6brIh616E66" role="3cqZAp">
                                                                       <node concept="3clFbC" id="6brIh616E67" role="3clFbG">
                                                                         <node concept="37vLTw" id="6brIh616E68" role="3uHU7w">
-                                                                          <ref role="3cqZAo" node="6brIh616E7g" resolve="model" />
+                                                                          <ref role="3cqZAo" node="2SR9xrsN2$G" resolve="model" />
                                                                         </node>
                                                                         <node concept="2OqwBi" id="6brIh616E69" role="3uHU7B">
                                                                           <node concept="37vLTw" id="6brIh616E6a" role="2Oq$k0">
-                                                                            <ref role="3cqZAo" node="6brIh616E6c" resolve="it" />
+                                                                            <ref role="3cqZAo" node="2SR9xrsN2$$" resolve="it" />
                                                                           </node>
                                                                           <node concept="I4A8Y" id="6brIh616PEG" role="2OqNvi" />
                                                                         </node>
                                                                       </node>
                                                                     </node>
                                                                   </node>
-                                                                  <node concept="Rh6nW" id="6brIh616E6c" role="1bW2Oz">
+                                                                  <node concept="gl6BB" id="2SR9xrsN2$$" role="1bW2Oz">
                                                                     <property role="TrG5h" value="it" />
-                                                                    <node concept="2jxLKc" id="6brIh616E6d" role="1tU5fm" />
+                                                                    <node concept="2jxLKc" id="2SR9xrsN2$_" role="1tU5fm" />
                                                                   </node>
                                                                 </node>
                                                               </node>
@@ -18956,7 +17857,7 @@
                                                                   <node concept="3clFbF" id="6brIh616E6h" role="3cqZAp">
                                                                     <node concept="2OqwBi" id="6brIh616E6i" role="3clFbG">
                                                                       <node concept="37vLTw" id="6brIh616E6j" role="2Oq$k0">
-                                                                        <ref role="3cqZAo" node="6brIh616E6l" resolve="it" />
+                                                                        <ref role="3cqZAo" node="2SR9xrsN2$A" resolve="it" />
                                                                       </node>
                                                                       <node concept="2qgKlT" id="6brIh616E6k" role="2OqNvi">
                                                                         <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -18964,9 +17865,9 @@
                                                                     </node>
                                                                   </node>
                                                                 </node>
-                                                                <node concept="Rh6nW" id="6brIh616E6l" role="1bW2Oz">
+                                                                <node concept="gl6BB" id="2SR9xrsN2$A" role="1bW2Oz">
                                                                   <property role="TrG5h" value="it" />
-                                                                  <node concept="2jxLKc" id="6brIh616E6m" role="1tU5fm" />
+                                                                  <node concept="2jxLKc" id="2SR9xrsN2$B" role="1tU5fm" />
                                                                 </node>
                                                               </node>
                                                               <node concept="1nlBCl" id="6brIh616E6n" role="2S7zOq">
@@ -18986,7 +17887,7 @@
                                                                         <ref role="1Y3XeK" to="hwgx:9MiAwFuePT" resolve="LeafNodeTreeViewNode" />
                                                                         <node concept="3Tm1VV" id="6brIh616E6v" role="1B3o_S" />
                                                                         <node concept="37vLTw" id="6brIh616E6w" role="37wK5m">
-                                                                          <ref role="3cqZAo" node="6brIh616E6K" resolve="root" />
+                                                                          <ref role="3cqZAo" node="2SR9xrsN2$C" resolve="root" />
                                                                         </node>
                                                                         <node concept="37vLTw" id="6brIh616E6x" role="37wK5m">
                                                                           <ref role="3cqZAo" to="hwgx:7NyyyjOcUiI" resolve="category" />
@@ -18999,10 +17900,10 @@
                                                                   </node>
                                                                 </node>
                                                               </node>
-                                                              <node concept="Rh6nW" id="6brIh616E6K" role="1bW2Oz">
+                                                              <node concept="gl6BB" id="2SR9xrsN2$C" role="1bW2Oz">
                                                                 <property role="TrG5h" value="root" />
                                                                 <property role="3TUv4t" value="true" />
-                                                                <node concept="2jxLKc" id="6brIh616E6L" role="1tU5fm" />
+                                                                <node concept="2jxLKc" id="2SR9xrsN2$D" role="1tU5fm" />
                                                               </node>
                                                             </node>
                                                           </node>
@@ -19036,20 +17937,20 @@
                                                               <node concept="3clFbF" id="6brIh616E70" role="3cqZAp">
                                                                 <node concept="3clFbC" id="6brIh616E71" role="3clFbG">
                                                                   <node concept="37vLTw" id="6brIh616E72" role="3uHU7w">
-                                                                    <ref role="3cqZAo" node="6brIh616E7g" resolve="model" />
+                                                                    <ref role="3cqZAo" node="2SR9xrsN2$G" resolve="model" />
                                                                   </node>
                                                                   <node concept="2OqwBi" id="6brIh616E73" role="3uHU7B">
                                                                     <node concept="37vLTw" id="6brIh616E74" role="2Oq$k0">
-                                                                      <ref role="3cqZAo" node="6brIh616E76" resolve="it" />
+                                                                      <ref role="3cqZAo" node="2SR9xrsN2$E" resolve="it" />
                                                                     </node>
                                                                     <node concept="I4A8Y" id="6brIh616QCM" role="2OqNvi" />
                                                                   </node>
                                                                 </node>
                                                               </node>
                                                             </node>
-                                                            <node concept="Rh6nW" id="6brIh616E76" role="1bW2Oz">
+                                                            <node concept="gl6BB" id="2SR9xrsN2$E" role="1bW2Oz">
                                                               <property role="TrG5h" value="it" />
-                                                              <node concept="2jxLKc" id="6brIh616E77" role="1tU5fm" />
+                                                              <node concept="2jxLKc" id="2SR9xrsN2$F" role="1tU5fm" />
                                                             </node>
                                                           </node>
                                                         </node>
@@ -19061,7 +17962,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="6brIh616E79" role="37wK5m">
                                                 <node concept="37vLTw" id="6brIh616E7a" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6brIh616E7g" resolve="model" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2$G" resolve="model" />
                                                 </node>
                                                 <node concept="liA8E" id="6brIh616MDr" role="2OqNvi">
                                                   <ref role="37wK5l" to="mhbf:~SModel.getModelName()" resolve="getModelName" />
@@ -19082,10 +17983,10 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6brIh616E7g" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2$G" role="1bW2Oz">
                                       <property role="TrG5h" value="model" />
                                       <property role="3TUv4t" value="true" />
-                                      <node concept="2jxLKc" id="6brIh616E7h" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2$H" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -19231,20 +18132,20 @@
                                                                       <node concept="3clFbF" id="2nGuY2QSAGf" role="3cqZAp">
                                                                         <node concept="17R0WA" id="2nGuY2QSAGg" role="3clFbG">
                                                                           <node concept="37vLTw" id="2nGuY2QSAGh" role="3uHU7w">
-                                                                            <ref role="3cqZAo" node="2nGuY2QShwR" resolve="rootConcept" />
+                                                                            <ref role="3cqZAo" node="2SR9xrsN2$Q" resolve="rootConcept" />
                                                                           </node>
                                                                           <node concept="2OqwBi" id="79i$vAY6euz" role="3uHU7B">
                                                                             <node concept="2yIwOk" id="79i$vAY6eu$" role="2OqNvi" />
                                                                             <node concept="37vLTw" id="2nGuY2QSAGj" role="2Oq$k0">
-                                                                              <ref role="3cqZAo" node="2nGuY2QSAGl" resolve="it" />
+                                                                              <ref role="3cqZAo" node="2SR9xrsN2$I" resolve="it" />
                                                                             </node>
                                                                           </node>
                                                                         </node>
                                                                       </node>
                                                                     </node>
-                                                                    <node concept="Rh6nW" id="2nGuY2QSAGl" role="1bW2Oz">
+                                                                    <node concept="gl6BB" id="2SR9xrsN2$I" role="1bW2Oz">
                                                                       <property role="TrG5h" value="it" />
-                                                                      <node concept="2jxLKc" id="2nGuY2QSAGm" role="1tU5fm" />
+                                                                      <node concept="2jxLKc" id="2SR9xrsN2$J" role="1tU5fm" />
                                                                     </node>
                                                                   </node>
                                                                 </node>
@@ -19255,7 +18156,7 @@
                                                                     <node concept="3clFbF" id="2nGuY2QUJx0" role="3cqZAp">
                                                                       <node concept="2OqwBi" id="2nGuY2QUJDo" role="3clFbG">
                                                                         <node concept="37vLTw" id="2nGuY2QUJwZ" role="2Oq$k0">
-                                                                          <ref role="3cqZAo" node="2nGuY2QUJaz" resolve="it" />
+                                                                          <ref role="3cqZAo" node="2SR9xrsN2$K" resolve="it" />
                                                                         </node>
                                                                         <node concept="2qgKlT" id="2nGuY2QUM3E" role="2OqNvi">
                                                                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -19263,9 +18164,9 @@
                                                                       </node>
                                                                     </node>
                                                                   </node>
-                                                                  <node concept="Rh6nW" id="2nGuY2QUJaz" role="1bW2Oz">
+                                                                  <node concept="gl6BB" id="2SR9xrsN2$K" role="1bW2Oz">
                                                                     <property role="TrG5h" value="it" />
-                                                                    <node concept="2jxLKc" id="2nGuY2QUJa$" role="1tU5fm" />
+                                                                    <node concept="2jxLKc" id="2SR9xrsN2$L" role="1tU5fm" />
                                                                   </node>
                                                                 </node>
                                                                 <node concept="1nlBCl" id="2nGuY2QUJa_" role="2S7zOq">
@@ -19285,7 +18186,7 @@
                                                                           <ref role="37wK5l" to="hwgx:9MiAwFueT6" resolve="LeafNodeTreeViewNode" />
                                                                           <node concept="3Tm1VV" id="2nGuY2QSFXS" role="1B3o_S" />
                                                                           <node concept="37vLTw" id="2nGuY2QSLp9" role="37wK5m">
-                                                                            <ref role="3cqZAo" node="2nGuY2QSDGO" resolve="root" />
+                                                                            <ref role="3cqZAo" node="2SR9xrsN2$M" resolve="root" />
                                                                           </node>
                                                                           <node concept="37vLTw" id="6brIh613oAP" role="37wK5m">
                                                                             <ref role="3cqZAo" to="hwgx:7NyyyjOcUiI" resolve="category" />
@@ -19309,7 +18210,7 @@
                                                                                   <node concept="2OqwBi" id="2nGuY2QTX8g" role="3uHU7w">
                                                                                     <node concept="2OqwBi" id="2nGuY2QTVb_" role="2Oq$k0">
                                                                                       <node concept="37vLTw" id="2nGuY2QTVaN" role="2Oq$k0">
-                                                                                        <ref role="3cqZAo" node="2nGuY2QSDGO" resolve="root" />
+                                                                                        <ref role="3cqZAo" node="2SR9xrsN2$M" resolve="root" />
                                                                                       </node>
                                                                                       <node concept="I4A8Y" id="2nGuY2QTWuy" role="2OqNvi" />
                                                                                     </node>
@@ -19327,10 +18228,10 @@
                                                                     </node>
                                                                   </node>
                                                                 </node>
-                                                                <node concept="Rh6nW" id="2nGuY2QSDGO" role="1bW2Oz">
+                                                                <node concept="gl6BB" id="2SR9xrsN2$M" role="1bW2Oz">
                                                                   <property role="TrG5h" value="root" />
                                                                   <property role="3TUv4t" value="true" />
-                                                                  <node concept="2jxLKc" id="2nGuY2QSDGP" role="1tU5fm" />
+                                                                  <node concept="2jxLKc" id="2SR9xrsN2$N" role="1tU5fm" />
                                                                 </node>
                                                               </node>
                                                             </node>
@@ -19364,20 +18265,20 @@
                                                                 <node concept="3clFbF" id="2nGuY2QSvvN" role="3cqZAp">
                                                                   <node concept="17R0WA" id="2nGuY2QSyPI" role="3clFbG">
                                                                     <node concept="37vLTw" id="2nGuY2QSz06" role="3uHU7w">
-                                                                      <ref role="3cqZAo" node="2nGuY2QShwR" resolve="rootConcept" />
+                                                                      <ref role="3cqZAo" node="2SR9xrsN2$Q" resolve="rootConcept" />
                                                                     </node>
                                                                     <node concept="2OqwBi" id="79i$vAY6euC" role="3uHU7B">
                                                                       <node concept="2yIwOk" id="79i$vAY6euD" role="2OqNvi" />
                                                                       <node concept="37vLTw" id="2nGuY2QSvvM" role="2Oq$k0">
-                                                                        <ref role="3cqZAo" node="2nGuY2QSvhw" resolve="it" />
+                                                                        <ref role="3cqZAo" node="2SR9xrsN2$O" resolve="it" />
                                                                       </node>
                                                                     </node>
                                                                   </node>
                                                                 </node>
                                                               </node>
-                                                              <node concept="Rh6nW" id="2nGuY2QSvhw" role="1bW2Oz">
+                                                              <node concept="gl6BB" id="2SR9xrsN2$O" role="1bW2Oz">
                                                                 <property role="TrG5h" value="it" />
-                                                                <node concept="2jxLKc" id="2nGuY2QSvhx" role="1tU5fm" />
+                                                                <node concept="2jxLKc" id="2SR9xrsN2$P" role="1tU5fm" />
                                                               </node>
                                                             </node>
                                                           </node>
@@ -19392,7 +18293,7 @@
                                                     <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                                                   </node>
                                                   <node concept="37vLTw" id="2nGuY2QSk7c" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="2nGuY2QShwR" resolve="rootConcept" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2$Q" resolve="rootConcept" />
                                                   </node>
                                                 </node>
                                                 <node concept="10Nm6u" id="2nGuY2QSnk$" role="37wK5m" />
@@ -19410,10 +18311,10 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2nGuY2QShwR" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2$Q" role="1bW2Oz">
                                         <property role="TrG5h" value="rootConcept" />
                                         <property role="3TUv4t" value="true" />
-                                        <node concept="2jxLKc" id="2nGuY2QShwS" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2$R" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -19506,7 +18407,7 @@
                                           <node concept="3clFbF" id="33WP3ANlcCy" role="3cqZAp">
                                             <node concept="2OqwBi" id="33WP3ANlcCz" role="3clFbG">
                                               <node concept="37vLTw" id="33WP3ANlcC$" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="33WP3ANlcCA" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2$S" resolve="it" />
                                               </node>
                                               <node concept="2qgKlT" id="33WP3ANlcC_" role="2OqNvi">
                                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -19514,9 +18415,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="33WP3ANlcCA" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN2$S" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="33WP3ANlcCB" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN2$T" role="1tU5fm" />
                                         </node>
                                       </node>
                                       <node concept="1nlBCl" id="33WP3ANlcCC" role="2S7zOq">
@@ -19536,7 +18437,7 @@
                                                 <ref role="37wK5l" to="hwgx:9MiAwFueT6" resolve="LeafNodeTreeViewNode" />
                                                 <node concept="3Tm1VV" id="33WP3ANlcCK" role="1B3o_S" />
                                                 <node concept="37vLTw" id="33WP3ANlcCL" role="37wK5m">
-                                                  <ref role="3cqZAo" node="33WP3ANlcD1" resolve="root" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2$U" resolve="root" />
                                                 </node>
                                                 <node concept="37vLTw" id="6brIh613voU" role="37wK5m">
                                                   <ref role="3cqZAo" to="hwgx:7NyyyjOcUiI" resolve="category" />
@@ -19560,7 +18461,7 @@
                                                         <node concept="2OqwBi" id="33WP3ANlcCV" role="3uHU7w">
                                                           <node concept="2OqwBi" id="33WP3ANlcCW" role="2Oq$k0">
                                                             <node concept="37vLTw" id="33WP3ANlcCX" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="33WP3ANlcD1" resolve="root" />
+                                                              <ref role="3cqZAo" node="2SR9xrsN2$U" resolve="root" />
                                                             </node>
                                                             <node concept="I4A8Y" id="33WP3ANlcCY" role="2OqNvi" />
                                                           </node>
@@ -19578,10 +18479,10 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="33WP3ANlcD1" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2$U" role="1bW2Oz">
                                         <property role="TrG5h" value="root" />
                                         <property role="3TUv4t" value="true" />
-                                        <node concept="2jxLKc" id="33WP3ANlcD2" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2$V" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -19658,6 +18559,7 @@
     <property role="TrG5h" value="openSolutionTree2" />
     <property role="2uzpH1" value="Open Solution Browser" />
     <property role="3GE5qa" value="solutionTree" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="2nGuY2QOxdv" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -19801,6 +18703,7 @@
     <property role="2uzpH1" value="Previous Tree" />
     <property role="3GE5qa" value="tree.toolbar" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rIR9" role="tncku">
       <node concept="3clFbS" id="4ppn3W9rIRa" role="2VODD2">
         <node concept="3clFbF" id="2aP19v30Ubv" role="3cqZAp">
@@ -19859,6 +18762,7 @@
     <property role="2uzpH1" value="Next Tree" />
     <property role="3GE5qa" value="tree.toolbar" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rIRf" role="tncku">
       <node concept="3clFbS" id="4ppn3W9rIRg" role="2VODD2">
         <node concept="3clFbF" id="2aP19v30Ucv" role="3cqZAp">
@@ -20384,6 +19288,7 @@
     <property role="TrG5h" value="RefreshButton" />
     <property role="2uzpH1" value="Refresh" />
     <property role="3GE5qa" value="tree.toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3ODAlcNAnya" role="tncku">
       <node concept="3clFbS" id="3ODAlcNAnyb" role="2VODD2">
         <node concept="3clFbF" id="33WP3AMCg0r" role="3cqZAp">
@@ -21016,6 +19921,7 @@
   <node concept="sE7Ow" id="4EItucYCCBf">
     <property role="TrG5h" value="ExportEditorImage" />
     <property role="2uzpH1" value="Export Editor Image" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4EItucYCCBg" role="tncku">
       <node concept="3clFbS" id="4EItucYCCBh" role="2VODD2">
         <node concept="3cpWs8" id="4EItucYCQqd" role="3cqZAp">
@@ -22513,7 +21419,7 @@
                       </node>
                       <node concept="2OqwBi" id="7SQqK0Fk5KA" role="33vP2m">
                         <node concept="37vLTw" id="7SQqK0Fk5KB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7SQqK0Fdk4V" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2$W" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7SQqK0Fk5KC" role="2OqNvi">
                           <ref role="37wK5l" to="exr9:~EditorCell_WithComponent.getComponent()" resolve="getComponent" />
@@ -22601,9 +21507,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7SQqK0Fdk4V" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2$W" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7SQqK0Fdk4W" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2$X" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -22715,6 +21621,7 @@
     <property role="2uzpH1" value="Print Editor" />
     <property role="3GE5qa" value="screenshot" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="79jc6YzgefD" role="tncku">
       <node concept="3clFbS" id="79jc6YzgefE" role="2VODD2">
         <node concept="3cpWs8" id="7SQqK0FfllC" role="3cqZAp">
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 d7e14a69374..6c019e7b756 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.base.pluginSolution" uuid="9e24fcdc-a232-4d24-8c95-1f525946191a" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.core.base.pluginSolution" uuid="9e24fcdc-a232-4d24-8c95-1f525946191a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -41,7 +40,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -51,7 +50,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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -106,7 +105,6 @@
     <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" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl
index 122406c67c2..9869b416d64 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl
@@ -53,7 +53,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -135,7 +135,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
@@ -216,7 +215,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)</dependency>
@@ -250,7 +248,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -269,7 +267,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
@@ -336,7 +334,6 @@
     <module reference="f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)" version="0" />
     <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/generator/template/main@generator.mps
index 2398d7cd81b..be7cee5b142 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/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="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
     <use id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" name="com.mbeddr.core.make" version="9" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="10" />
@@ -123,7 +123,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -159,7 +159,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -194,7 +194,7 @@
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
@@ -245,7 +245,7 @@
       <concept id="1195502151594" name="jetbrains.mps.lang.generator.structure.MappingScriptReference" flags="lg" index="1puMqW">
         <reference id="1195502167610" name="mappingScript" index="1puQsG" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ngI" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
@@ -268,6 +268,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -315,7 +316,7 @@
         <child id="5591170374822423775" name="contentIfTrue" index="1CrrWa" />
       </concept>
       <concept id="5591170374822422760" name="com.mbeddr.core.make.structure.IfDefDirective" flags="ng" index="1CrrGX" />
-      <concept id="5591170374834120753" name="com.mbeddr.core.make.structure.IMakefileItem" flags="ng" index="1FeNJ$">
+      <concept id="5591170374834120753" name="com.mbeddr.core.make.structure.IMakefileItem" flags="ngI" index="1FeNJ$">
         <property id="764400354221313493" name="escaped" index="1L4fZ7" />
       </concept>
       <concept id="5591170374827384567" name="com.mbeddr.core.make.structure.MacroRm" flags="ng" index="1FOsOy" />
@@ -467,7 +468,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -508,7 +509,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -589,7 +589,7 @@
                     <node concept="3clFbF" id="2VaoB3Xxpye" role="3cqZAp">
                       <node concept="2OqwBi" id="2VaoB3XxpO5" role="3clFbG">
                         <node concept="37vLTw" id="2VaoB3Xxpyd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2VaoB3Xxpt_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1El" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="2VaoB3XxqoA" role="2OqNvi">
                           <node concept="chp4Y" id="2VaoB3Xxq$W" role="cj9EA">
@@ -599,9 +599,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2VaoB3Xxpt_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1El" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2VaoB3XxptA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Em" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -642,7 +642,7 @@
                         </node>
                         <node concept="2OqwBi" id="3MG7Fm2wisI" role="3uHU7B">
                           <node concept="37vLTw" id="3MG7Fm2we$P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MG7Fm2wdRH" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1En" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3MG7Fm2wj3S" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -651,9 +651,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3MG7Fm2wdRH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1En" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3MG7Fm2wdRI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Eo" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1299,7 +1299,7 @@
                             <node concept="3clFbF" id="5ara9PcfqsR" role="3cqZAp">
                               <node concept="2OqwBi" id="5ara9PcfqQT" role="3clFbG">
                                 <node concept="37vLTw" id="5ara9PcfqsQ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5ara9Pcfq8v" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ep" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5ara9Pcfs8I" role="2OqNvi">
                                   <ref role="3TsBF5" to="51wr:5ara9Pcdcpm" resolve="shared" />
@@ -1307,9 +1307,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5ara9Pcfq8v" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Ep" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5ara9Pcfq8w" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Eq" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2514,7 +2514,7 @@
                           <node concept="2OqwBi" id="5n9FwLWYBDg" role="3clFbG">
                             <node concept="2OqwBi" id="5n9FwLWYBDh" role="2Oq$k0">
                               <node concept="37vLTw" id="5n9FwLWYBDi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5n9FwLWYBDl" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Er" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="5n9FwLWYBDj" role="2OqNvi">
                                 <ref role="3TtcxE" to="51wr:51p726VIDVA" resolve="externalBuilds" />
@@ -2524,9 +2524,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5n9FwLWYBDl" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Er" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5n9FwLWYBDm" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Es" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2826,7 +2826,7 @@
                             <node concept="2OqwBi" id="6xoAPBjXlWQ" role="3uHU7w">
                               <node concept="2OqwBi" id="6xoAPBjX00H" role="2Oq$k0">
                                 <node concept="37vLTw" id="6xoAPBjWZxU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5yBZnF4BkFt" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Et" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="6xoAPBjXjSg" role="2OqNvi">
                                   <ref role="3TtcxE" to="51wr:51p726VIDVA" resolve="externalBuilds" />
@@ -2837,7 +2837,7 @@
                             <node concept="2OqwBi" id="1v64rj$Hz$5" role="3uHU7B">
                               <node concept="2OqwBi" id="5yBZnF4Bm14" role="2Oq$k0">
                                 <node concept="37vLTw" id="5yBZnF4BloM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5yBZnF4BkFt" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Et" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="6xoAPBjXdQw" role="2OqNvi">
                                   <ref role="3TtcxE" to="51wr:2kkumeGQBlk" resolve="referencedLibs" />
@@ -2848,9 +2848,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5yBZnF4BkFt" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Et" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5yBZnF4BkFu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Eu" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3665,7 +3665,7 @@
                         <node concept="3clFbF" id="6xoAPBk0QEL" role="3cqZAp">
                           <node concept="2OqwBi" id="6xoAPBk0QEN" role="3clFbG">
                             <node concept="37vLTw" id="6xoAPBk0QEO" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6xoAPBk0QER" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ev" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6xoAPBk0QEP" role="2OqNvi">
                               <ref role="3TtcxE" to="51wr:51p726VIDVA" resolve="externalBuilds" />
@@ -3673,9 +3673,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6xoAPBk0QER" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ev" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6xoAPBk0QES" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ew" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3821,7 +3821,7 @@
                         <node concept="3clFbF" id="6xoAPBk0NYg" role="3cqZAp">
                           <node concept="2OqwBi" id="6xoAPBk0NYh" role="3clFbG">
                             <node concept="37vLTw" id="6xoAPBk0NYi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6xoAPBk0NYk" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ex" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6xoAPBk0NYj" role="2OqNvi">
                               <ref role="3TtcxE" to="51wr:2kkumeGQBlk" resolve="referencedLibs" />
@@ -3829,9 +3829,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6xoAPBk0NYk" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ex" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6xoAPBk0NYl" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ey" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3923,16 +3923,16 @@
                                     <ref role="1Pybhc" to="ahli:6VqaxF9qVvF" resolve="BuildVariableHelper" />
                                     <ref role="37wK5l" to="ahli:6VqaxF9yDdY" resolve="getSupportedTargetsVarName" />
                                     <node concept="37vLTw" id="4JZ_DSweDdh" role="37wK5m">
-                                      <ref role="3cqZAo" node="4JZ_DSweCFP" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ez" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4JZ_DSweCFP" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Ez" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4JZ_DSweCFQ" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1E$" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -5029,7 +5029,7 @@
                           <node concept="3fqX7Q" id="4UbnhBDNQkD" role="3clFbG">
                             <node concept="2OqwBi" id="4UbnhBDNQkF" role="3fr31v">
                               <node concept="37vLTw" id="4UbnhBDNQkG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4UbnhBDNOOm" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1E_" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="4UbnhBDNQkH" role="2OqNvi">
                                 <ref role="3TsBF5" to="51wr:5ara9Pcdcpm" resolve="shared" />
@@ -5038,9 +5038,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4UbnhBDNOOm" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1E_" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4UbnhBDNOOn" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1EA" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5074,7 +5074,7 @@
                                   <ref role="cht4Q" to="51wr:2kkumeGQcAy" resolve="Library" />
                                 </node>
                                 <node concept="37vLTw" id="4UbnhBDNNCM" role="1m5AlR">
-                                  <ref role="3cqZAo" node="4UbnhBDKDlP" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1EB" resolve="it" />
                                 </node>
                               </node>
                               <node concept="3TrcHB" id="4UbnhBDNNCN" role="2OqNvi">
@@ -5084,7 +5084,7 @@
                           </node>
                           <node concept="2OqwBi" id="4UbnhBDKDlL" role="3uHU7B">
                             <node concept="37vLTw" id="4UbnhBDKDlM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4UbnhBDKDlP" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1EB" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="4UbnhBDKDlN" role="2OqNvi">
                               <node concept="chp4Y" id="4UbnhBDKDlO" role="cj9EA">
@@ -5095,9 +5095,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4UbnhBDKDlP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1EB" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4UbnhBDKDlQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1EC" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5584,7 +5584,7 @@
                         <node concept="3clFbF" id="4UbnhBDNR4p" role="3cqZAp">
                           <node concept="2OqwBi" id="4UbnhBDNRwL" role="3clFbG">
                             <node concept="37vLTw" id="4UbnhBDNR4o" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4UbnhBDNR4a" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1ED" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="4UbnhBDNSfO" role="2OqNvi">
                               <ref role="3TsBF5" to="51wr:5ara9Pcdcpm" resolve="shared" />
@@ -5592,9 +5592,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4UbnhBDNR4a" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1ED" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4UbnhBDNR4b" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1EE" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5627,7 +5627,7 @@
                                 <ref role="cht4Q" to="51wr:2kkumeGQcAy" resolve="Library" />
                               </node>
                               <node concept="37vLTw" id="4UbnhBDNIoJ" role="1m5AlR">
-                                <ref role="3cqZAo" node="4UbnhBDNlQZ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1EF" resolve="it" />
                               </node>
                             </node>
                             <node concept="3TrcHB" id="4UbnhBDNKkd" role="2OqNvi">
@@ -5636,7 +5636,7 @@
                           </node>
                           <node concept="2OqwBi" id="4UbnhBDNlQV" role="3uHU7B">
                             <node concept="37vLTw" id="4UbnhBDNlQW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4UbnhBDNlQZ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1EF" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="4UbnhBDNlQX" role="2OqNvi">
                               <node concept="chp4Y" id="4UbnhBDNlQY" role="cj9EA">
@@ -5647,9 +5647,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4UbnhBDNlQZ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1EF" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4UbnhBDNlR0" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1EG" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6181,7 +6181,7 @@
                       <node concept="3clFbF" id="4UbnhBDKdyN" role="3cqZAp">
                         <node concept="2OqwBi" id="4UbnhBDKdyO" role="3clFbG">
                           <node concept="37vLTw" id="4UbnhBDKdyP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4UbnhBDKdyS" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1EH" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4UbnhBDKdyQ" role="2OqNvi">
                             <node concept="chp4Y" id="4UbnhBDKdyR" role="cj9EA">
@@ -6191,9 +6191,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4UbnhBDKdyS" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1EH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4UbnhBDKdyT" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1EI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6293,7 +6293,7 @@
                               </node>
                               <node concept="2OqwBi" id="7Aba6ByHlzx" role="37vLTJ">
                                 <node concept="37vLTw" id="7Aba6ByHl7g" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7Aba6ByHkZb" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1EJ" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7Aba6ByHxof" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:7Aba6ByEJr$" resolve="moduleNamePrefix" />
@@ -6302,9 +6302,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7Aba6ByHkZb" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1EJ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7Aba6ByHkZc" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1EK" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6414,7 +6414,7 @@
                                 <node concept="3clFbF" id="4JZ_DSwk7zM" role="3cqZAp">
                                   <node concept="2OqwBi" id="4JZ_DSwk7Po" role="3clFbG">
                                     <node concept="37vLTw" id="4JZ_DSwk7zL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4JZ_DSwk7u1" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1EL" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="4JZ_DSwk8km" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6422,9 +6422,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4JZ_DSwk7u1" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1EL" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4JZ_DSwk7u2" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1EM" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -8021,7 +8021,7 @@
                                   <node concept="3clFbF" id="6xgYZvf1WUh" role="3cqZAp">
                                     <node concept="2OqwBi" id="6xgYZvf1WUo" role="3clFbG">
                                       <node concept="37vLTw" id="6xgYZvf1WUp" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6xgYZvf1WUr" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1EN" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="6xgYZvf1WUq" role="2OqNvi">
                                         <ref role="37wK5l" to="qd6m:1pUJNHTblHu" resolve="hasHeaderFileContent" />
@@ -8029,9 +8029,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6xgYZvf1WUr" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1EN" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6xgYZvf1WUs" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1EO" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -8068,7 +8068,7 @@
                                     <node concept="3cpWs3" id="6xgYZvf1WUS" role="3clFbG">
                                       <node concept="2OqwBi" id="6xgYZvf1WUT" role="3uHU7w">
                                         <node concept="37vLTw" id="6xgYZvf1WUU" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6xgYZvf1WV1" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1EP" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="6xgYZvf1WUV" role="2OqNvi">
                                           <ref role="37wK5l" to="qd6m:1zF3M6MR330" resolve="getHeaderFileExtension" />
@@ -8077,7 +8077,7 @@
                                       <node concept="3cpWs3" id="6xgYZvf1WUW" role="3uHU7B">
                                         <node concept="2OqwBi" id="6xgYZvf1WUX" role="3uHU7B">
                                           <node concept="37vLTw" id="6xgYZvf1WUY" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6xgYZvf1WV1" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1EP" resolve="it" />
                                           </node>
                                           <node concept="2qgKlT" id="6xgYZvf1WUZ" role="2OqNvi">
                                             <ref role="37wK5l" to="qd6m:7Aba6BzsCXL" resolve="getHeaderFileName" />
@@ -8090,9 +8090,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6xgYZvf1WV1" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1EP" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6xgYZvf1WV2" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1EQ" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -8103,24 +8103,24 @@
                                 <node concept="3clFbF" id="4UbnhBE129_" role="3cqZAp">
                                   <node concept="2OqwBi" id="4UbnhBE129A" role="3clFbG">
                                     <node concept="37vLTw" id="4UbnhBE129B" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4UbnhBE129E" resolve="a" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1ER" resolve="a" />
                                     </node>
                                     <node concept="liA8E" id="4UbnhBE129C" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~String.compareToIgnoreCase(java.lang.String)" resolve="compareToIgnoreCase" />
                                       <node concept="37vLTw" id="4UbnhBE129D" role="37wK5m">
-                                        <ref role="3cqZAo" node="4UbnhBE129G" resolve="b" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ET" resolve="b" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4UbnhBE129E" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1ER" role="1bW2Oz">
                                 <property role="TrG5h" value="a" />
-                                <node concept="2jxLKc" id="4UbnhBE129F" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1ES" role="1tU5fm" />
                               </node>
-                              <node concept="Rh6nW" id="4UbnhBE129G" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1ET" role="1bW2Oz">
                                 <property role="TrG5h" value="b" />
-                                <node concept="2jxLKc" id="4UbnhBE129H" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1EU" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="4UbnhBE129I" role="2Dq5b$">
@@ -8218,7 +8218,7 @@
                                       <node concept="3clFbF" id="6TPUpoCG$n8" role="3cqZAp">
                                         <node concept="2OqwBi" id="6TPUpoCG_5r" role="3clFbG">
                                           <node concept="37vLTw" id="6TPUpoCG$n7" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6TPUpoCG$4Q" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1EV" resolve="it" />
                                           </node>
                                           <node concept="2qgKlT" id="6TPUpoCGAlS" role="2OqNvi">
                                             <ref role="37wK5l" to="qd6m:6TPUpoC$ak6" resolve="hasSourceFileContent" />
@@ -8226,9 +8226,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6TPUpoCG$4Q" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1EV" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6TPUpoCG$4R" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1EW" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -8240,7 +8240,7 @@
                                       <node concept="3cpWs3" id="20BlhoiqgTt" role="3clFbG">
                                         <node concept="2OqwBi" id="20BlhoiqgTu" role="3uHU7w">
                                           <node concept="37vLTw" id="20BlhoiqgTv" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="20BlhoiqgTA" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1EX" resolve="it" />
                                           </node>
                                           <node concept="2qgKlT" id="20BlhoiqgTw" role="2OqNvi">
                                             <ref role="37wK5l" to="qd6m:3N$tYyGbO1v" resolve="getSourceFileExtension" />
@@ -8249,7 +8249,7 @@
                                         <node concept="3cpWs3" id="20BlhoiqgTx" role="3uHU7B">
                                           <node concept="2OqwBi" id="20BlhoiqgTy" role="3uHU7B">
                                             <node concept="37vLTw" id="20BlhoiqgTz" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="20BlhoiqgTA" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1EX" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="20BlhoiqgT$" role="2OqNvi">
                                               <ref role="37wK5l" to="qd6m:7Aba6BzsPRm" resolve="getSourceFileName" />
@@ -8262,9 +8262,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="20BlhoiqgTA" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1EX" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="20BlhoiqgTB" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1EY" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -8295,7 +8295,7 @@
                                       <node concept="3clFbF" id="6hbeR3KSwMp" role="3cqZAp">
                                         <node concept="2OqwBi" id="6hbeR3KSwMq" role="3clFbG">
                                           <node concept="37vLTw" id="6hbeR3KSwMr" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6hbeR3KSwMt" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1EZ" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="6hbeR3KSwMs" role="2OqNvi">
                                             <ref role="3TsBF5" to="x27k:5jyom5fOqJg" resolve="path" />
@@ -8303,9 +8303,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6hbeR3KSwMt" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1EZ" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6hbeR3KSwMu" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1F0" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -8318,24 +8318,24 @@
                                 <node concept="3clFbF" id="6hbeR3LuPKu" role="3cqZAp">
                                   <node concept="2OqwBi" id="6hbeR3LuPKv" role="3clFbG">
                                     <node concept="37vLTw" id="6hbeR3LuPKw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6hbeR3LuPKz" resolve="a" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1F1" resolve="a" />
                                     </node>
                                     <node concept="liA8E" id="6hbeR3LuPKx" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~String.compareToIgnoreCase(java.lang.String)" resolve="compareToIgnoreCase" />
                                       <node concept="37vLTw" id="6hbeR3LuPKy" role="37wK5m">
-                                        <ref role="3cqZAo" node="6hbeR3LuPK_" resolve="b" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1F3" resolve="b" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6hbeR3LuPKz" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1F1" role="1bW2Oz">
                                 <property role="TrG5h" value="a" />
-                                <node concept="2jxLKc" id="6hbeR3LuPK$" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1F2" role="1tU5fm" />
                               </node>
-                              <node concept="Rh6nW" id="6hbeR3LuPK_" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1F3" role="1bW2Oz">
                                 <property role="TrG5h" value="b" />
-                                <node concept="2jxLKc" id="6hbeR3LuPKA" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1F4" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="6hbeR3LuPKB" role="2Dq5b$">
@@ -10085,14 +10085,14 @@
                                           <node concept="2qgKlT" id="6xgYZveZIml" role="2OqNvi">
                                             <ref role="37wK5l" to="ahli:6xgYZvdb5s9" resolve="isOnlyImportedByHeaderGeneratingExternalModulesIncludedInReferencedLibs" />
                                             <node concept="37vLTw" id="6xgYZveZImm" role="37wK5m">
-                                              <ref role="3cqZAo" node="6xgYZveZImq" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1F5" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                       <node concept="2OqwBi" id="6xgYZveZImn" role="3uHU7B">
                                         <node concept="37vLTw" id="6xgYZveZImo" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6xgYZveZImq" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1F5" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="6xgYZveZImp" role="2OqNvi">
                                           <ref role="37wK5l" to="qd6m:1pUJNHTblHu" resolve="hasHeaderFileContent" />
@@ -10101,9 +10101,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6xgYZveZImq" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1F5" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6xgYZveZImr" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1F6" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -10136,16 +10136,16 @@
                                         <node concept="2qgKlT" id="6xgYZveZOTv" role="2OqNvi">
                                           <ref role="37wK5l" to="ahli:6xgYZvdaOkh" resolve="isOnlyIncludedInReferencedLibs" />
                                           <node concept="37vLTw" id="6xgYZveZOTw" role="37wK5m">
-                                            <ref role="3cqZAo" node="6xgYZveZOTx" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1F7" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6xgYZveZOTx" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1F7" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6xgYZveZOTy" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1F8" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -10167,7 +10167,7 @@
                                     <node concept="3cpWs3" id="6xgYZveNw6O" role="3clFbG">
                                       <node concept="2OqwBi" id="6xgYZveNw6P" role="3uHU7w">
                                         <node concept="37vLTw" id="6xgYZveNw6Q" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3PUmE2ljhWg" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1F9" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="6xgYZvf1Krc" role="2OqNvi">
                                           <ref role="37wK5l" to="qd6m:1zF3M6MR330" resolve="getHeaderFileExtension" />
@@ -10176,7 +10176,7 @@
                                       <node concept="3cpWs3" id="6xgYZveNw6S" role="3uHU7B">
                                         <node concept="2OqwBi" id="6xgYZveNw6T" role="3uHU7B">
                                           <node concept="37vLTw" id="6xgYZveNw6U" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3PUmE2ljhWg" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1F9" resolve="it" />
                                           </node>
                                           <node concept="2qgKlT" id="6xgYZveNw6V" role="2OqNvi">
                                             <ref role="37wK5l" to="qd6m:7Aba6BzsCXL" resolve="getHeaderFileName" />
@@ -10189,9 +10189,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3PUmE2ljhWg" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1F9" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3PUmE2ljhWh" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1Fa" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -10202,24 +10202,24 @@
                                 <node concept="3clFbF" id="4UbnhBDZmAV" role="3cqZAp">
                                   <node concept="2OqwBi" id="4UbnhBDZmAW" role="3clFbG">
                                     <node concept="37vLTw" id="4UbnhBDZmAX" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4UbnhBDZmB0" resolve="a" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Fb" resolve="a" />
                                     </node>
                                     <node concept="liA8E" id="4UbnhBDZmAY" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~String.compareToIgnoreCase(java.lang.String)" resolve="compareToIgnoreCase" />
                                       <node concept="37vLTw" id="4UbnhBDZmAZ" role="37wK5m">
-                                        <ref role="3cqZAo" node="4UbnhBDZmB2" resolve="b" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Fd" resolve="b" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4UbnhBDZmB0" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Fb" role="1bW2Oz">
                                 <property role="TrG5h" value="a" />
-                                <node concept="2jxLKc" id="4UbnhBDZmB1" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Fc" role="1tU5fm" />
                               </node>
-                              <node concept="Rh6nW" id="4UbnhBDZmB2" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Fd" role="1bW2Oz">
                                 <property role="TrG5h" value="b" />
-                                <node concept="2jxLKc" id="4UbnhBDZmB3" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Fe" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="4UbnhBDZmB4" role="2Dq5b$">
@@ -10520,14 +10520,14 @@
                                               <node concept="2qgKlT" id="6xgYZvdeSm2" role="2OqNvi">
                                                 <ref role="37wK5l" to="ahli:6xgYZvdb5s9" resolve="isOnlyImportedByHeaderGeneratingExternalModulesIncludedInReferencedLibs" />
                                                 <node concept="37vLTw" id="6xgYZvdeSm3" role="37wK5m">
-                                                  <ref role="3cqZAo" node="6TPUpoCGv68" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Ff" resolve="it" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                           <node concept="2OqwBi" id="6TPUpoCGwct" role="3uHU7B">
                                             <node concept="37vLTw" id="6TPUpoCGvrH" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6TPUpoCGv68" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Ff" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="6TPUpoCGxwe" role="2OqNvi">
                                               <ref role="37wK5l" to="qd6m:6TPUpoC$ak6" resolve="hasSourceFileContent" />
@@ -10536,9 +10536,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6TPUpoCGv68" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1Ff" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6TPUpoCGv69" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Fg" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -10600,7 +10600,7 @@
                                           <node concept="3cpWs3" id="20BlhoiqgZF" role="3cqZAk">
                                             <node concept="2OqwBi" id="20BlhoiqgZG" role="3uHU7w">
                                               <node concept="37vLTw" id="20BlhoiqgZH" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="20Blhoiqh0r" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1Fh" resolve="it" />
                                               </node>
                                               <node concept="2qgKlT" id="20BlhoiqgZI" role="2OqNvi">
                                                 <ref role="37wK5l" to="qd6m:3N$tYyGbO1v" resolve="getSourceFileExtension" />
@@ -10609,7 +10609,7 @@
                                             <node concept="3cpWs3" id="20BlhoiqgZJ" role="3uHU7B">
                                               <node concept="2OqwBi" id="20BlhoiqgZK" role="3uHU7B">
                                                 <node concept="37vLTw" id="20BlhoiqgZL" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="20Blhoiqh0r" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Fh" resolve="it" />
                                                 </node>
                                                 <node concept="2qgKlT" id="20BlhoiqgZM" role="2OqNvi">
                                                   <ref role="37wK5l" to="qd6m:7Aba6BzsPRm" resolve="getSourceFileName" />
@@ -10626,7 +10626,7 @@
                                         <node concept="2OqwBi" id="20BlhoiqgZP" role="3uHU7w">
                                           <node concept="2OqwBi" id="20BlhoiqgZQ" role="2Oq$k0">
                                             <node concept="37vLTw" id="20BlhoiqgZR" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="20Blhoiqh0r" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Fh" resolve="it" />
                                             </node>
                                             <node concept="3CFZ6_" id="20BlhoiqgZS" role="2OqNvi">
                                               <node concept="3CFYIy" id="20BlhoiqgZT" role="3CFYIz">
@@ -10640,7 +10640,7 @@
                                           <node concept="3clFbC" id="20BlhoiqgZW" role="3uHU7B">
                                             <node concept="2OqwBi" id="20BlhoiqgZX" role="3uHU7B">
                                               <node concept="37vLTw" id="20BlhoiqgZY" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="20Blhoiqh0r" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1Fh" resolve="it" />
                                               </node>
                                               <node concept="I4A8Y" id="20BlhoiqgZZ" role="2OqNvi" />
                                             </node>
@@ -10660,7 +10660,7 @@
                                             <node concept="3cpWs3" id="20Blhoiqh07" role="3cqZAk">
                                               <node concept="2OqwBi" id="20Blhoiqh08" role="3uHU7w">
                                                 <node concept="37vLTw" id="20Blhoiqh09" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="20Blhoiqh0r" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Fh" resolve="it" />
                                                 </node>
                                                 <node concept="2qgKlT" id="20Blhoiqh0a" role="2OqNvi">
                                                   <ref role="37wK5l" to="qd6m:3N$tYyGbO1v" resolve="getSourceFileExtension" />
@@ -10679,7 +10679,7 @@
                                                         <node concept="2OqwBi" id="20Blhoiqh0h" role="37wK5m">
                                                           <node concept="2OqwBi" id="20Blhoiqh0i" role="2Oq$k0">
                                                             <node concept="37vLTw" id="20Blhoiqh0j" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="20Blhoiqh0r" resolve="it" />
+                                                              <ref role="3cqZAo" node="2SR9xrsN1Fh" resolve="it" />
                                                             </node>
                                                             <node concept="I4A8Y" id="20Blhoiqh0k" role="2OqNvi" />
                                                           </node>
@@ -10693,7 +10693,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="20Blhoiqh0n" role="3uHU7w">
                                                     <node concept="37vLTw" id="20Blhoiqh0o" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="20Blhoiqh0r" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN1Fh" resolve="it" />
                                                     </node>
                                                     <node concept="2qgKlT" id="20Blhoiqh0p" role="2OqNvi">
                                                       <ref role="37wK5l" to="qd6m:7Aba6BzsPRm" resolve="getSourceFileName" />
@@ -10710,9 +10710,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="20Blhoiqh0r" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1Fh" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="20Blhoiqh0s" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1Fi" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -10743,7 +10743,7 @@
                                       <node concept="3clFbF" id="6hbeR3KSgSM" role="3cqZAp">
                                         <node concept="2OqwBi" id="6hbeR3KShZM" role="3clFbG">
                                           <node concept="37vLTw" id="6hbeR3KSgSL" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6hbeR3KSgqT" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Fj" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="6hbeR3KSj5x" role="2OqNvi">
                                             <ref role="3TsBF5" to="x27k:5jyom5fOqJg" resolve="path" />
@@ -10751,9 +10751,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6hbeR3KSgqT" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1Fj" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6hbeR3KSgqU" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Fk" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -10766,24 +10766,24 @@
                                 <node concept="3clFbF" id="6hbeR3LuMhj" role="3cqZAp">
                                   <node concept="2OqwBi" id="6hbeR3LuMYa" role="3clFbG">
                                     <node concept="37vLTw" id="6hbeR3LuMhi" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6hbeR3LuLqW" resolve="a" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Fl" resolve="a" />
                                     </node>
                                     <node concept="liA8E" id="6hbeR3LuO3L" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~String.compareToIgnoreCase(java.lang.String)" resolve="compareToIgnoreCase" />
                                       <node concept="37vLTw" id="6hbeR3LuOnU" role="37wK5m">
-                                        <ref role="3cqZAo" node="6hbeR3LuLqY" resolve="b" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Fn" resolve="b" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6hbeR3LuLqW" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Fl" role="1bW2Oz">
                                 <property role="TrG5h" value="a" />
-                                <node concept="2jxLKc" id="6hbeR3LuLqX" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Fm" role="1tU5fm" />
                               </node>
-                              <node concept="Rh6nW" id="6hbeR3LuLqY" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Fn" role="1bW2Oz">
                                 <property role="TrG5h" value="b" />
-                                <node concept="2jxLKc" id="6hbeR3LuLqZ" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Fo" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="6hbeR3LuLr0" role="2Dq5b$">
@@ -10834,7 +10834,7 @@
                                             <ref role="37wK5l" to="ahli:6VqaxF9rkl2" resolve="getExtSrcDirVarName" />
                                             <ref role="1Pybhc" to="ahli:6VqaxF9qVvF" resolve="BuildVariableHelper" />
                                             <node concept="37vLTw" id="4JZ_DSxwaer" role="37wK5m">
-                                              <ref role="3cqZAo" node="4JZ_DSxwaew" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Fp" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
@@ -10844,7 +10844,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="4JZ_DSxwaet" role="3uHU7w">
                                         <node concept="37vLTw" id="4JZ_DSxwaeu" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4JZ_DSxwaew" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Fp" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="4JZ_DSxwaev" role="2OqNvi">
                                           <ref role="3TsBF5" to="51wr:51p726V_PmM" resolve="namePattern" />
@@ -10854,9 +10854,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4JZ_DSxwaew" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Fp" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4JZ_DSxwaex" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Fq" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -11001,7 +11001,7 @@
                                         <node concept="2OqwBi" id="3z9Ctyjpx8q" role="2Oq$k0">
                                           <node concept="2OqwBi" id="3z9Ctyjpx8r" role="2Oq$k0">
                                             <node concept="37vLTw" id="3z9Ctyjpx8s" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3z9Ctyjpx8x" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Fr" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="3z9Ctyjpx8t" role="2OqNvi">
                                               <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -11017,9 +11017,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3z9Ctyjpx8x" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1Fr" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3z9Ctyjpx8y" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1Fs" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -11031,7 +11031,7 @@
                                     <node concept="2OqwBi" id="3z9Ctyjpx8B" role="3clFbG">
                                       <node concept="2OqwBi" id="3z9Ctyjpx8C" role="2Oq$k0">
                                         <node concept="37vLTw" id="3z9Ctyjpx8D" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3z9Ctyjpx8G" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Ft" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="3z9Ctyjpx8E" role="2OqNvi">
                                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -11041,9 +11041,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3z9Ctyjpx8G" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1Ft" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3z9Ctyjpx8H" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1Fu" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -11060,7 +11060,7 @@
                                 <node concept="2OqwBi" id="6xoAPBkdslL" role="3uHU7w">
                                   <node concept="2OqwBi" id="6xoAPBkdslM" role="2Oq$k0">
                                     <node concept="37vLTw" id="6xoAPBkdslN" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3z9Ctyjpx8T" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Fx" resolve="it" />
                                     </node>
                                     <node concept="2RRcyG" id="6xoAPBkdslO" role="2OqNvi">
                                       <node concept="chp4Y" id="34w7WGUSF14" role="3MHsoP">
@@ -11073,7 +11073,7 @@
                                 <node concept="1Wc70l" id="6xoAPBkcr7O" role="3uHU7B">
                                   <node concept="3y3z36" id="3z9Ctyjpx8O" role="3uHU7B">
                                     <node concept="37vLTw" id="3z9Ctyjpx8P" role="3uHU7B">
-                                      <ref role="3cqZAo" node="3z9Ctyjpx8T" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Fx" resolve="it" />
                                     </node>
                                     <node concept="2OqwBi" id="3z9Ctyjpx8Q" role="3uHU7w">
                                       <node concept="30H73N" id="3z9Ctyjpx8R" role="2Oq$k0" />
@@ -11100,22 +11100,22 @@
                                               <node concept="3clFbF" id="6xoAPBkcRvM" role="3cqZAp">
                                                 <node concept="2OqwBi" id="6xoAPBkcRvN" role="3clFbG">
                                                   <node concept="37vLTw" id="6xoAPBkcRvO" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="6xoAPBkcRvQ" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1Fv" resolve="it" />
                                                   </node>
                                                   <node concept="I4A8Y" id="6xoAPBkcRvP" role="2OqNvi" />
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="6xoAPBkcRvQ" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN1Fv" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="6xoAPBkcRvR" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN1Fw" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                       <node concept="3JPx81" id="6xoAPBkcRvS" role="2OqNvi">
                                         <node concept="37vLTw" id="6xoAPBkcRvT" role="25WWJ7">
-                                          <ref role="3cqZAo" node="3z9Ctyjpx8T" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Fx" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -11124,9 +11124,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3z9Ctyjpx8T" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Fx" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3z9Ctyjpx8U" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Fy" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -11144,7 +11144,7 @@
                                 <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
                                 <ref role="37wK5l" to="w1kc:~SModelOperations.getOutputLocation(org.jetbrains.mps.openapi.model.SModel)" resolve="getOutputLocation" />
                                 <node concept="37vLTw" id="3z9Ctyjpx92" role="37wK5m">
-                                  <ref role="3cqZAo" node="3z9Ctyjpx9j" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Fz" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -11158,7 +11158,7 @@
                                   <node concept="WxPPo" id="27yO7ubzfTa" role="28ntcv">
                                     <node concept="2OqwBi" id="3z9Ctyjpx97" role="WxPPp">
                                       <node concept="37vLTw" id="3z9Ctyjpx98" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3z9Ctyjpx9j" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Fz" resolve="it" />
                                       </node>
                                       <node concept="LkI2h" id="3z9Ctyjpx99" role="2OqNvi" />
                                     </node>
@@ -11192,9 +11192,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3z9Ctyjpx9j" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Fz" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3z9Ctyjpx9k" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1F$" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -12153,7 +12153,7 @@
                               <node concept="1Wc70l" id="3KgA2I1pqGg" role="3clFbG">
                                 <node concept="2OqwBi" id="4JZ_DSvA0aS" role="3uHU7B">
                                   <node concept="37vLTw" id="4JZ_DSvA0aT" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4JZ_DSvA0aW" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1F_" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="4JZ_DSvA0aU" role="2OqNvi">
                                     <node concept="chp4Y" id="4JZ_DSvA1gl" role="cj9EA">
@@ -12164,7 +12164,7 @@
                                 <node concept="2OqwBi" id="3KgA2I1pr4Y" role="3uHU7w">
                                   <node concept="2OqwBi" id="3KgA2I1pr4Z" role="2Oq$k0">
                                     <node concept="37vLTw" id="3KgA2I1pr50" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4JZ_DSvA0aW" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1F_" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="3KgA2I1pr51" role="2OqNvi">
                                       <ref role="37wK5l" to="ahli:4JZ_DSvFz7s" resolve="getArchitecture" />
@@ -12175,9 +12175,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4JZ_DSvA0aW" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1F_" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4JZ_DSvA0aX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1FA" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -12212,7 +12212,7 @@
                               <node concept="2OqwBi" id="3KgA2I1p87X" role="3uHU7w">
                                 <node concept="2OqwBi" id="3KgA2I1p4Ro" role="2Oq$k0">
                                   <node concept="37vLTw" id="3KgA2I1p4$m" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3KgA2I1oJ7A" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FB" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="3KgA2I1p79C" role="2OqNvi">
                                     <ref role="37wK5l" to="ahli:4JZ_DSvFz7s" resolve="getArchitecture" />
@@ -12222,7 +12222,7 @@
                               </node>
                               <node concept="2OqwBi" id="3KgA2I1oJ7y" role="3uHU7B">
                                 <node concept="37vLTw" id="3KgA2I1oJ7z" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3KgA2I1oJ7A" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1FB" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="3KgA2I1oJ7$" role="2OqNvi">
                                   <node concept="chp4Y" id="3KgA2I1oJ7_" role="cj9EA">
@@ -12233,9 +12233,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3KgA2I1oJ7A" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1FB" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3KgA2I1oJ7B" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1FC" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -12376,7 +12376,7 @@
                               <node concept="1Wc70l" id="3KgA2I1pt3G" role="3clFbG">
                                 <node concept="2OqwBi" id="4JZ_DSvA3MW" role="3uHU7B">
                                   <node concept="37vLTw" id="4JZ_DSvA3MX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4JZ_DSvA3N0" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FD" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="4JZ_DSvA3MY" role="2OqNvi">
                                     <node concept="chp4Y" id="4JZ_DSvA4Ed" role="cj9EA">
@@ -12387,7 +12387,7 @@
                                 <node concept="2OqwBi" id="3KgA2I1ptNJ" role="3uHU7w">
                                   <node concept="2OqwBi" id="3KgA2I1ptNK" role="2Oq$k0">
                                     <node concept="37vLTw" id="3KgA2I1ptNL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4JZ_DSvA3N0" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1FD" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="3KgA2I1ptNM" role="2OqNvi">
                                       <ref role="37wK5l" to="ahli:4JZ_DSvFz7s" resolve="getArchitecture" />
@@ -12398,9 +12398,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4JZ_DSvA3N0" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1FD" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4JZ_DSvA3N1" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1FE" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -12440,7 +12440,7 @@
                             <node concept="1Wc70l" id="3KgA2I1pcAB" role="3clFbG">
                               <node concept="2OqwBi" id="3KgA2I1oEih" role="3uHU7B">
                                 <node concept="37vLTw" id="3KgA2I1oEii" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3KgA2I1oEil" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1FF" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="3KgA2I1oEij" role="2OqNvi">
                                   <node concept="chp4Y" id="3KgA2I1oEik" role="cj9EA">
@@ -12451,7 +12451,7 @@
                               <node concept="2OqwBi" id="3KgA2I1pcGL" role="3uHU7w">
                                 <node concept="2OqwBi" id="3KgA2I1pcGM" role="2Oq$k0">
                                   <node concept="37vLTw" id="3KgA2I1pcGN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3KgA2I1oEil" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FF" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="3KgA2I1pcGO" role="2OqNvi">
                                     <ref role="37wK5l" to="ahli:4JZ_DSvFz7s" resolve="getArchitecture" />
@@ -12462,9 +12462,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3KgA2I1oEil" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1FF" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3KgA2I1oEim" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1FG" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -12605,7 +12605,7 @@
                               <node concept="1Wc70l" id="3KgA2I1pzrq" role="3clFbG">
                                 <node concept="2OqwBi" id="4JZ_DSvA2qq" role="3uHU7B">
                                   <node concept="37vLTw" id="4JZ_DSvA2qr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4JZ_DSvA2qu" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FH" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="4JZ_DSvA2qs" role="2OqNvi">
                                     <node concept="chp4Y" id="4JZ_DSvA5jY" role="cj9EA">
@@ -12616,7 +12616,7 @@
                                 <node concept="2OqwBi" id="3KgA2I1pz_j" role="3uHU7w">
                                   <node concept="2OqwBi" id="3KgA2I1pz_k" role="2Oq$k0">
                                     <node concept="37vLTw" id="3KgA2I1pz_l" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4JZ_DSvA2qu" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1FH" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="3KgA2I1pz_m" role="2OqNvi">
                                       <ref role="37wK5l" to="ahli:4JZ_DSvFz7s" resolve="getArchitecture" />
@@ -12627,9 +12627,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4JZ_DSvA2qu" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1FH" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4JZ_DSvA2qv" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1FI" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -12669,7 +12669,7 @@
                             <node concept="1Wc70l" id="3KgA2I1pfL9" role="3clFbG">
                               <node concept="2OqwBi" id="3KgA2I1oME6" role="3uHU7B">
                                 <node concept="37vLTw" id="3KgA2I1oME7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3KgA2I1oMEa" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1FJ" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="3KgA2I1oME8" role="2OqNvi">
                                   <node concept="chp4Y" id="3KgA2I1oME9" role="cj9EA">
@@ -12680,7 +12680,7 @@
                               <node concept="2OqwBi" id="3KgA2I1pfRj" role="3uHU7w">
                                 <node concept="2OqwBi" id="3KgA2I1pfRk" role="2Oq$k0">
                                   <node concept="37vLTw" id="3KgA2I1pfRl" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3KgA2I1oMEa" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FJ" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="3KgA2I1pfRm" role="2OqNvi">
                                     <ref role="37wK5l" to="ahli:4JZ_DSvFz7s" resolve="getArchitecture" />
@@ -12691,9 +12691,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3KgA2I1oMEa" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1FJ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3KgA2I1oMEb" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1FK" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -12878,7 +12878,7 @@
                     <node concept="3clFbF" id="2_BfG8PQAhs" role="3cqZAp">
                       <node concept="2OqwBi" id="2_BfG8PQACD" role="3clFbG">
                         <node concept="37vLTw" id="2_BfG8PQAhr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2_BfG8PQAaj" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1FL" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="2_BfG8PQBfu" role="2OqNvi">
                           <node concept="1xMEDy" id="2_BfG8PQBfw" role="1xVPHs">
@@ -12890,9 +12890,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2_BfG8PQAaj" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1FL" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2_BfG8PQAak" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1FM" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12903,7 +12903,7 @@
                   <node concept="3clFbF" id="2_BfG8PQCu_" role="3cqZAp">
                     <node concept="2OqwBi" id="2_BfG8PQCRB" role="3clFbG">
                       <node concept="37vLTw" id="2_BfG8PQCu$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2_BfG8PQCsJ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1FN" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="2_BfG8PQDFY" role="2OqNvi">
                         <node concept="2pJPEk" id="2_BfG8PQDPu" role="1P9ThW">
@@ -12918,7 +12918,7 @@
                                     <ref role="1Pybhc" to="ahli:6VqaxF9qVvF" resolve="BuildVariableHelper" />
                                     <node concept="2OqwBi" id="2_BfG8PQGOo" role="37wK5m">
                                       <node concept="37vLTw" id="2_BfG8PQGyT" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2_BfG8PQCsJ" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1FN" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="2_BfG8PQHD_" role="2OqNvi">
                                         <ref role="3TsBF5" to="68mc:4eXJ6EO9ZKy" resolve="macro" />
@@ -12936,7 +12936,7 @@
                               <node concept="WxPPo" id="59cfP9u6L90" role="28ntcv">
                                 <node concept="2OqwBi" id="2_BfG8PQL4M" role="WxPPp">
                                   <node concept="37vLTw" id="2_BfG8PQKME" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2_BfG8PQCsJ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FN" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="1kEmdwEJE56" role="2OqNvi">
                                     <ref role="37wK5l" to="48kf:6WnTJkDceu8" resolve="getPrefix" />
@@ -12953,7 +12953,7 @@
                               <node concept="WxPPo" id="27yO7ubzfTe" role="28ntcv">
                                 <node concept="2OqwBi" id="2_BfG8PQMMQ" role="WxPPp">
                                   <node concept="37vLTw" id="2_BfG8PQMwy" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2_BfG8PQCsJ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FN" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="2_BfG8PQNxs" role="2OqNvi">
                                     <ref role="3TsBF5" to="68mc:5lKnBeAtODI" resolve="path" />
@@ -12967,9 +12967,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2_BfG8PQCsJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1FN" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2_BfG8PQCsK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1FO" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12993,7 +12993,7 @@
                     <node concept="3clFbF" id="2_BfG8PXSFX" role="3cqZAp">
                       <node concept="2OqwBi" id="2_BfG8PXSFY" role="3clFbG">
                         <node concept="37vLTw" id="2_BfG8PXSFZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2_BfG8PXSG3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1FP" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="2_BfG8PXSG0" role="2OqNvi">
                           <node concept="1xMEDy" id="2_BfG8PXSG1" role="1xVPHs">
@@ -13005,9 +13005,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2_BfG8PXSG3" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1FP" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2_BfG8PXSG4" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1FQ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -13018,7 +13018,7 @@
                   <node concept="3clFbF" id="2_BfG8PXSG8" role="3cqZAp">
                     <node concept="2OqwBi" id="2_BfG8PXSG9" role="3clFbG">
                       <node concept="37vLTw" id="2_BfG8PXSGa" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2_BfG8PXSGt" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1FR" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="2_BfG8PXSGb" role="2OqNvi">
                         <node concept="2pJPEk" id="2_BfG8PXSGc" role="1P9ThW">
@@ -13035,7 +13035,7 @@
                                       <ref role="37wK5l" to="48kf:2_BfG8QCYyu" resolve="getSolutionNameForNode" />
                                       <ref role="1Pybhc" to="48kf:4Wn4fzjJqEK" resolve="SolutionUtil" />
                                       <node concept="37vLTw" id="2_BfG8QD0uv" role="37wK5m">
-                                        <ref role="3cqZAo" node="2_BfG8PXSGt" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1FR" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
@@ -13050,7 +13050,7 @@
                               <node concept="WxPPo" id="59cfP9u6L91" role="28ntcv">
                                 <node concept="2OqwBi" id="2_BfG8PXSGm" role="WxPPp">
                                   <node concept="37vLTw" id="2_BfG8PXSGn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2_BfG8PXSGt" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FR" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="6WnTJkDctlA" role="2OqNvi">
                                     <ref role="37wK5l" to="48kf:6WnTJkDceu8" resolve="getPrefix" />
@@ -13067,7 +13067,7 @@
                               <node concept="WxPPo" id="27yO7ubzfTh" role="28ntcv">
                                 <node concept="2OqwBi" id="2_BfG8PXSGq" role="WxPPp">
                                   <node concept="37vLTw" id="2_BfG8PXSGr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2_BfG8PXSGt" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1FR" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="2_BfG8PXSGs" role="2OqNvi">
                                     <ref role="3TsBF5" to="68mc:5lKnBeAtODI" resolve="path" />
@@ -13081,9 +13081,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2_BfG8PXSGt" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1FR" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2_BfG8PXSGu" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1FS" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -13392,7 +13392,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="3JWussfjy8x" role="1m5AlR">
                                         <node concept="37vLTw" id="3JWussfjy8y" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3JWussfjy8_" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1FT" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="3JWussfjy8z" role="2OqNvi">
                                           <ref role="3Tt5mk" to="tp2q:hzMiK3c" resolve="key" />
@@ -13406,9 +13406,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3JWussfjy8_" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1FT" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3JWussfjy8A" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1FU" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -13426,7 +13426,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="3JWussfjVOK" role="1m5AlR">
                                         <node concept="37vLTw" id="3JWussfjVpO" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3JWussfjT6i" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1FV" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="3JWussfjWPM" role="2OqNvi">
                                           <ref role="3Tt5mk" to="tp2q:hzMiK3c" resolve="key" />
@@ -13448,7 +13448,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="3JWussfk3l8" role="1m5AlR">
                                       <node concept="37vLTw" id="3JWussfk3l9" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3JWussfjT6i" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1FV" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="3JWussfk3la" role="2OqNvi">
                                         <ref role="3Tt5mk" to="tp2q:hzMiM9f" resolve="value" />
@@ -13462,9 +13462,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3JWussfjT6i" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1FV" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3JWussfjT6j" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1FW" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -13694,7 +13694,7 @@
                                       <node concept="WxPPo" id="tl4PXin$2Z" role="28ntcv">
                                         <node concept="2OqwBi" id="3ptpjvRniaH" role="WxPPp">
                                           <node concept="37vLTw" id="3ptpjvRniaI" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3ptpjvRniaQ" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1FX" resolve="it" />
                                           </node>
                                           <node concept="3AY5_j" id="3ptpjvRniaJ" role="2OqNvi" />
                                         </node>
@@ -13711,7 +13711,7 @@
                                       <node concept="WxPPo" id="tl4PXin$30" role="28ntcv">
                                         <node concept="2OqwBi" id="3ptpjvRniaN" role="WxPPp">
                                           <node concept="37vLTw" id="3ptpjvRniaO" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3ptpjvRniaQ" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1FX" resolve="it" />
                                           </node>
                                           <node concept="3AV6Ez" id="3ptpjvRniaP" role="2OqNvi" />
                                         </node>
@@ -13723,9 +13723,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3ptpjvRniaQ" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1FX" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3ptpjvRniaR" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1FY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -13885,7 +13885,7 @@
                             <node concept="17R0WA" id="2ZYW8RqGTTr" role="3clFbG">
                               <node concept="2OqwBi" id="2ZYW8RqGTTs" role="3uHU7B">
                                 <node concept="37vLTw" id="2ZYW8RqGTTt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2ZYW8RqGTTw" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1FZ" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="2ZYW8RqGTTu" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -13897,9 +13897,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ZYW8RqGTTw" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1FZ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ZYW8RqGTTx" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1G0" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/actions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/actions.mps
index 7d1994d4af4..7c5d896d55c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/actions.mps
@@ -57,7 +57,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -99,7 +99,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
index f4a8bc26064..5332b1d712f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
@@ -105,7 +105,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -234,7 +234,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -263,7 +263,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -293,6 +293,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -448,7 +449,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -500,7 +501,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
@@ -611,7 +611,7 @@
                               <node concept="2OqwBi" id="4oh1JoZDGAM" role="2Oq$k0">
                                 <node concept="2OqwBi" id="4oh1JoZDGAe" role="2Oq$k0">
                                   <node concept="37vLTw" id="4oh1JoZDGAd" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4oh1JoZDGAa" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1AP" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="4oh1JoZDGAi" role="2OqNvi">
                                     <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -623,7 +623,7 @@
                                       <node concept="3clFbF" id="4oh1JoZDGBm" role="3cqZAp">
                                         <node concept="2OqwBi" id="4oh1JoZDGBo" role="3clFbG">
                                           <node concept="37vLTw" id="4oh1JoZDGBn" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4oh1JoZDGBk" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1AN" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4oh1JoZDGBs" role="2OqNvi">
                                             <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -631,9 +631,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4oh1JoZDGBk" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1AN" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4oh1JoZDGBl" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1AO" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -641,9 +641,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4oh1JoZDGAa" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1AP" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4oh1JoZDGAb" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1AQ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -970,7 +970,7 @@
                       <node concept="2OqwBi" id="6xgYZvcuu5G" role="3clFbG">
                         <node concept="2OqwBi" id="6xgYZvcuqXR" role="2Oq$k0">
                           <node concept="37vLTw" id="6xgYZvcuqD7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6xgYZvcuqlF" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1AT" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6xgYZvcurP9" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -984,7 +984,7 @@
                                   <node concept="2OqwBi" id="6xgYZvcu$lz" role="3uHU7B">
                                     <node concept="2OqwBi" id="6xgYZvcu$l$" role="2Oq$k0">
                                       <node concept="37vLTw" id="6xgYZvcu$l_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6xgYZvcuyYy" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1AR" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6xgYZvcu$lA" role="2OqNvi">
                                         <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -1005,18 +1005,18 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6xgYZvcuyYy" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1AR" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6xgYZvcuyYz" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1AS" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6xgYZvcuqlF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1AT" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6xgYZvcuqlG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1AU" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1075,7 +1075,7 @@
                       <node concept="2OqwBi" id="6xgYZvcsiF8" role="3clFbG">
                         <node concept="2OqwBi" id="6xgYZvcseQ2" role="2Oq$k0">
                           <node concept="37vLTw" id="6xgYZvcsero" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6xgYZvcsdnA" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1AX" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6xgYZvcsfS2" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -1089,7 +1089,7 @@
                                   <node concept="2OqwBi" id="6xgYZvcs9bF" role="3uHU7B">
                                     <node concept="2OqwBi" id="6xgYZvcs9bG" role="2Oq$k0">
                                       <node concept="37vLTw" id="6xgYZvcs9bH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6xgYZvcskBF" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1AV" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6xgYZvcs9bI" role="2OqNvi">
                                         <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -1110,18 +1110,18 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6xgYZvcskBF" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1AV" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6xgYZvcskBG" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1AW" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6xgYZvcsdnA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1AX" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6xgYZvcsdnB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1AY" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1260,7 +1260,7 @@
                                     <ref role="cht4Q" to="51wr:4o9sgv8QoKi" resolve="Executable" />
                                   </node>
                                   <node concept="37vLTw" id="6xgYZvcuRf4" role="1m5AlR">
-                                    <ref role="3cqZAo" node="6xgYZvcuNkX" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1AZ" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3Tsc0h" id="6xgYZvcuUyA" role="2OqNvi">
@@ -1281,7 +1281,7 @@
                         </node>
                         <node concept="2OqwBi" id="6xgYZvcuO2Z" role="3uHU7B">
                           <node concept="37vLTw" id="6xgYZvcuNJE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6xgYZvcuNkX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1AZ" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="6xgYZvcuPe8" role="2OqNvi">
                             <node concept="chp4Y" id="6xgYZvcuPNj" role="cj9EA">
@@ -1292,9 +1292,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6xgYZvcuNkX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1AZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6xgYZvcuNkY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1B0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1438,14 +1438,14 @@
                       <node concept="BsUDl" id="2qdxtjsBHAm" role="3clFbG">
                         <ref role="37wK5l" node="6xgYZvdaDS2" resolve="getIncludingReferencedLibs" />
                         <node concept="37vLTw" id="2qdxtjsBHAn" role="37wK5m">
-                          <ref role="3cqZAo" node="2qdxtjsBHAo" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1B1" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2qdxtjsBHAo" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1B1" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2qdxtjsBHAp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1B2" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1494,7 +1494,7 @@
                                     <ref role="cht4Q" to="51wr:4o9sgv8QoKi" resolve="Executable" />
                                   </node>
                                   <node concept="37vLTw" id="2qdxtjsBHAM" role="1m5AlR">
-                                    <ref role="3cqZAo" node="2qdxtjsBHAW" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1B3" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3Tsc0h" id="2qdxtjsBHAN" role="2OqNvi">
@@ -1515,7 +1515,7 @@
                         </node>
                         <node concept="2OqwBi" id="2qdxtjsBHAS" role="3uHU7B">
                           <node concept="37vLTw" id="2qdxtjsBHAT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2qdxtjsBHAW" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1B3" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="2qdxtjsBHAU" role="2OqNvi">
                             <node concept="chp4Y" id="2qdxtjsBHAV" role="cj9EA">
@@ -1526,9 +1526,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2qdxtjsBHAW" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1B3" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2qdxtjsBHAX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1B4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1613,7 +1613,7 @@
                           <node concept="3clFbF" id="5GYFpoPr$mo" role="3cqZAp">
                             <node concept="2OqwBi" id="5GYFpoPr$mp" role="3clFbG">
                               <node concept="37vLTw" id="5GYFpoPr$mq" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5GYFpoPr$mu" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1B5" resolve="it" />
                               </node>
                               <node concept="2Rf3mk" id="5GYFpoPr$mr" role="2OqNvi">
                                 <node concept="1xMEDy" id="5GYFpoPr$ms" role="1xVPHs">
@@ -1625,9 +1625,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5GYFpoPr$mu" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1B5" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5GYFpoPr$mv" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1B6" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1690,7 +1690,7 @@
                           <node concept="2OqwBi" id="3ptpjvRni9B" role="3clFbG">
                             <node concept="2OqwBi" id="3ptpjvRni9C" role="2Oq$k0">
                               <node concept="37vLTw" id="3ptpjvRni9D" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3ptpjvRni9U" resolve="provider" />
+                                <ref role="3cqZAo" node="2SR9xrsN1B9" resolve="provider" />
                               </node>
                               <node concept="2qgKlT" id="3ptpjvRni9E" role="2OqNvi">
                                 <ref role="37wK5l" node="6xoAPBjOH1K" resolve="getVariableNames" />
@@ -1702,11 +1702,11 @@
                                   <node concept="3clFbF" id="3ptpjvRni9I" role="3cqZAp">
                                     <node concept="1Ls8ON" id="3ptpjvRni9J" role="3clFbG">
                                       <node concept="37vLTw" id="3ptpjvRni9K" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3ptpjvRni9S" resolve="variableName" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1B7" resolve="variableName" />
                                       </node>
                                       <node concept="2OqwBi" id="3ptpjvRni9L" role="1Lso8e">
                                         <node concept="37vLTw" id="3ptpjvRni9M" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3ptpjvRni9U" resolve="provider" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1B9" resolve="provider" />
                                         </node>
                                         <node concept="2qgKlT" id="3ptpjvRni9N" role="2OqNvi">
                                           <ref role="37wK5l" node="6xoAPBjOH2T" resolve="getDefaultValue" />
@@ -1714,25 +1714,25 @@
                                             <ref role="3cqZAo" node="3JWussfh5Se" resolve="model" />
                                           </node>
                                           <node concept="37vLTw" id="3ptpjvRni9R" role="37wK5m">
-                                            <ref role="3cqZAo" node="3ptpjvRni9S" resolve="variableName" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1B7" resolve="variableName" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3ptpjvRni9S" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1B7" role="1bW2Oz">
                                   <property role="TrG5h" value="variableName" />
-                                  <node concept="2jxLKc" id="3ptpjvRni9T" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1B8" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3ptpjvRni9U" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1B9" role="1bW2Oz">
                         <property role="TrG5h" value="provider" />
-                        <node concept="2jxLKc" id="3ptpjvRni9V" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ba" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1750,7 +1750,7 @@
                               <property role="3cmrfH" value="0" />
                             </node>
                             <node concept="37vLTw" id="3ptpjvRnia6" role="1LFl5Q">
-                              <ref role="3cqZAo" node="3ptpjvRnia7" resolve="variable" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Bb" resolve="variable" />
                             </node>
                           </node>
                         </node>
@@ -1760,9 +1760,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3ptpjvRnia7" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Bb" role="1bW2Oz">
                     <property role="TrG5h" value="variable" />
-                    <node concept="2jxLKc" id="3ptpjvRnia8" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Bc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1777,7 +1777,7 @@
                           <property role="3cmrfH" value="1" />
                         </node>
                         <node concept="37vLTw" id="3ptpjvRniag" role="1LFl5Q">
-                          <ref role="3cqZAo" node="3ptpjvRniam" resolve="variable" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Bd" resolve="variable" />
                         </node>
                       </node>
                       <node concept="3EllGN" id="3ptpjvRniah" role="37vLTJ">
@@ -1786,7 +1786,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="3ptpjvRniak" role="1LFl5Q">
-                            <ref role="3cqZAo" node="3ptpjvRniam" resolve="variable" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Bd" resolve="variable" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="3ptpjvRnial" role="3ElQJh">
@@ -1796,9 +1796,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3ptpjvRniam" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Bd" role="1bW2Oz">
                   <property role="TrG5h" value="variable" />
-                  <node concept="2jxLKc" id="3ptpjvRnian" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Be" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1915,7 +1915,7 @@
                   <node concept="3clFbF" id="3BbcpZJ16ve" role="3cqZAp">
                     <node concept="2OqwBi" id="3BbcpZJ16vg" role="3clFbG">
                       <node concept="37vLTw" id="3BbcpZJ16vf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3BbcpZJ16vc" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Bf" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="3BbcpZJ16vk" role="2OqNvi">
                         <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -1923,9 +1923,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3BbcpZJ16vc" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Bf" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3BbcpZJ16vd" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Bg" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1963,7 +1963,7 @@
                       <node concept="2OqwBi" id="7RiewQ_lHPC" role="3clFbG">
                         <node concept="2OqwBi" id="7RiewQ_lHPJ" role="2Oq$k0">
                           <node concept="37vLTw" id="7RiewQ_lHPB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7RiewQ_lHP$" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Bh" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7RiewQ_lHPN" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -1977,9 +1977,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7RiewQ_lHP$" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Bh" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7RiewQ_lHP_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Bi" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1994,7 +1994,7 @@
                       </node>
                       <node concept="2OqwBi" id="7RiewQ_lHQe" role="1m5AlR">
                         <node concept="37vLTw" id="7RiewQ_lHQd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7RiewQ_lHQa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Bj" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7RiewQ_lHQi" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2003,9 +2003,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7RiewQ_lHQa" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Bj" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7RiewQ_lHQb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Bk" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2037,7 +2037,7 @@
                     <node concept="2OqwBi" id="2B9nouIQtlq" role="3clFbG">
                       <node concept="2OqwBi" id="2B9nouIQtlr" role="2Oq$k0">
                         <node concept="37vLTw" id="2B9nouIQtls" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2B9nouIQtlv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Bl" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2B9nouIQtlt" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2049,9 +2049,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2B9nouIQtlv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Bl" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2B9nouIQtlw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Bm" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2079,7 +2079,7 @@
                       <node concept="2OqwBi" id="4$QybXn2c8O" role="3clFbG">
                         <node concept="2OqwBi" id="4$QybXn2c8J" role="2Oq$k0">
                           <node concept="37vLTw" id="4$QybXn2c8I" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4$QybXn2c8F" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Bn" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4$QybXn2c8N" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2093,9 +2093,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4$QybXn2c8F" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Bn" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4$QybXn2c8G" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Bo" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2110,7 +2110,7 @@
                       </node>
                       <node concept="2OqwBi" id="4$QybXn2esJ" role="1m5AlR">
                         <node concept="37vLTw" id="4$QybXn2esI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4$QybXn2esF" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Bp" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4$QybXn2esN" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2119,9 +2119,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4$QybXn2esF" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Bp" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4$QybXn2esG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Bq" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2159,7 +2159,7 @@
                             </node>
                             <node concept="2OqwBi" id="3PUmE2lg59N" role="1m5AlR">
                               <node concept="37vLTw" id="3PUmE2lg4QG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3PUmE2lfQRf" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Br" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3PUmE2lg5Pf" role="2OqNvi">
                                 <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2173,7 +2173,7 @@
                         <node concept="2OqwBi" id="3PUmE2lfQR9" role="3uHU7B">
                           <node concept="2OqwBi" id="3PUmE2lfQRa" role="2Oq$k0">
                             <node concept="37vLTw" id="3PUmE2lfQRb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3PUmE2lfQRf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Br" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3PUmE2lfQRc" role="2OqNvi">
                               <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2188,9 +2188,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3PUmE2lfQRf" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Br" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3PUmE2lfQRg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Bs" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2205,7 +2205,7 @@
                       </node>
                       <node concept="2OqwBi" id="3PUmE2lfQRn" role="1m5AlR">
                         <node concept="37vLTw" id="3PUmE2lfQRo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3PUmE2lfQRq" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Bt" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3PUmE2lfQRp" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2214,9 +2214,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3PUmE2lfQRq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Bt" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3PUmE2lfQRr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Bu" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2282,7 +2282,7 @@
                             <node concept="3clFbF" id="4$QybXn2hEx" role="3cqZAp">
                               <node concept="2OqwBi" id="4$QybXn2hEz" role="3clFbG">
                                 <node concept="37vLTw" id="4$QybXn2hEy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4$QybXn2hEv" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Bv" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="4$QybXn2hEB" role="2OqNvi">
                                   <node concept="chp4Y" id="4$QybXn2hED" role="cj9EA">
@@ -2292,9 +2292,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4$QybXn2hEv" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Bv" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4$QybXn2hEw" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Bw" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2308,14 +2308,14 @@
                                 <ref role="cht4Q" to="x27k:5jyom5fOqJu" resolve="ObjResourceDescriptor" />
                               </node>
                               <node concept="37vLTw" id="4$QybXn2hET" role="1m5AlR">
-                                <ref role="3cqZAo" node="4$QybXn2hEQ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Bx" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4$QybXn2hEQ" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Bx" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4$QybXn2hER" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1By" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2519,7 +2519,7 @@
                                           <property role="Xl_RC" value="package " />
                                         </node>
                                         <node concept="37vLTw" id="6GZLGDRre6I" role="3uHU7w">
-                                          <ref role="3cqZAo" node="6GZLGDRrf$6" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Bz" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -2527,9 +2527,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6GZLGDRrf$6" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Bz" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6GZLGDRrf$7" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1B$" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2651,9 +2651,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6GZLGDRrf$t" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1B_" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6GZLGDRrf$u" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1BA" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2842,7 +2842,7 @@
                                           <property role="Xl_RC" value="package " />
                                         </node>
                                         <node concept="37vLTw" id="6GZLGDRrhLi" role="3uHU7w">
-                                          <ref role="3cqZAo" node="6GZLGDRrhLj" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1BB" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -2850,9 +2850,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6GZLGDRrhLj" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1BB" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6GZLGDRrhLk" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1BC" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2973,9 +2973,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6GZLGDRrhM5" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1BD" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6GZLGDRrhM6" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1BE" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3193,7 +3193,7 @@
                                           <property role="Xl_RC" value="package " />
                                         </node>
                                         <node concept="37vLTw" id="6GZLGDRripE" role="3uHU7w">
-                                          <ref role="3cqZAo" node="6GZLGDRripF" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1BF" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -3201,9 +3201,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6GZLGDRripF" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1BF" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6GZLGDRripG" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1BG" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3273,7 +3273,7 @@
                                 <node concept="3fqX7Q" id="5YZjOkv$OzT" role="3clFbG">
                                   <node concept="2OqwBi" id="5YZjOkv$O$h" role="3fr31v">
                                     <node concept="37vLTw" id="5YZjOkv$OzW" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5YZjOkv$OzP" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1BH" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="5YZjOkv$O$o" role="2OqNvi">
                                       <node concept="chp4Y" id="5YZjOkv$O$r" role="cj9EA">
@@ -3284,9 +3284,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5YZjOkv$OzP" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1BH" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5YZjOkv$OzQ" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1BI" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3301,6 +3301,9 @@
                               <ref role="37wK5l" to="grvc:6xkj9mMqLK" resolve="add" />
                               <node concept="3cpWs3" id="2DnVhjrrDCR" role="37wK5m">
                                 <node concept="3cpWs3" id="5YZjOkv$LwQ" role="3uHU7B">
+                                  <node concept="Xl_RD" id="5YZjOkv$LwT" role="3uHU7w">
+                                    <property role="Xl_RC" value=" " />
+                                  </node>
                                   <node concept="2OqwBi" id="4yCyDr3ipjo" role="3uHU7B">
                                     <node concept="2OqwBi" id="5YZjOkv$LvI" role="2Oq$k0">
                                       <node concept="2GrUjf" id="5YZjOkv$Lvp" role="2Oq$k0">
@@ -3312,9 +3315,6 @@
                                       <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                                     </node>
                                   </node>
-                                  <node concept="Xl_RD" id="5YZjOkv$LwT" role="3uHU7w">
-                                    <property role="Xl_RC" value=" " />
-                                  </node>
                                 </node>
                                 <node concept="2OqwBi" id="2N1CSr$Er7y" role="3uHU7w">
                                   <node concept="37vLTw" id="2N1CSr$EqT_" role="2Oq$k0">
@@ -3476,9 +3476,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6GZLGDRriqh" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1BJ" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6GZLGDRriqi" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1BK" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3662,7 +3662,7 @@
                           <node concept="3clFbF" id="4JZ_DSwgMUT" role="3cqZAp">
                             <node concept="2OqwBi" id="4JZ_DSwgMUU" role="3clFbG">
                               <node concept="37vLTw" id="4JZ_DSwgMUV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4JZ_DSwgMV3" resolve="supportedTarget" />
+                                <ref role="3cqZAo" node="2SR9xrsN1BL" resolve="supportedTarget" />
                               </node>
                               <node concept="1mIQ4w" id="4JZ_DSwgMUW" role="2OqNvi">
                                 <node concept="25Kdxt" id="4JZ_DSwgMUX" role="cj9EA">
@@ -3677,9 +3677,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4JZ_DSwgMV3" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1BL" role="1bW2Oz">
                           <property role="TrG5h" value="supportedTarget" />
-                          <node concept="2jxLKc" id="4JZ_DSwgMV4" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1BM" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4023,7 +4023,7 @@
                     <node concept="3clFbF" id="94IdDJ_fnv" role="3cqZAp">
                       <node concept="2OqwBi" id="94IdDJ_fnw" role="3clFbG">
                         <node concept="37vLTw" id="94IdDJ_fnx" role="2Oq$k0">
-                          <ref role="3cqZAo" node="94IdDJ_fnz" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1BN" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="94IdDJ_fny" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:7Vd878ENIh6" resolve="isImplementationArtifact" />
@@ -4031,9 +4031,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="94IdDJ_fnz" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1BN" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="94IdDJ_fn$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1BO" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4151,7 +4151,7 @@
                             <node concept="3clFbF" id="2kkumeGQ_xw" role="3cqZAp">
                               <node concept="2OqwBi" id="2kkumeGQ_xx" role="3clFbG">
                                 <node concept="37vLTw" id="2kkumeGQ_xy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2kkumeGQ_x_" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1BP" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="2kkumeGQ_xz" role="2OqNvi">
                                   <node concept="chp4Y" id="2kkumeGQ_x$" role="cj9EA">
@@ -4161,9 +4161,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2kkumeGQ_x_" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1BP" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2kkumeGQ_xA" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1BQ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4177,14 +4177,14 @@
                                 <ref role="cht4Q" to="x27k:5jyom5fOqJu" resolve="ObjResourceDescriptor" />
                               </node>
                               <node concept="37vLTw" id="2kkumeGQ_xG" role="1m5AlR">
-                                <ref role="3cqZAo" node="2kkumeGQ_xH" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1BR" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2kkumeGQ_xH" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1BR" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2kkumeGQ_xI" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1BS" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4433,7 +4433,7 @@
                             <node concept="3clFbF" id="2kkumeGQ_wH" role="3cqZAp">
                               <node concept="2OqwBi" id="2kkumeGQ_wI" role="3clFbG">
                                 <node concept="37vLTw" id="2kkumeGQ_wJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2kkumeGQ_wM" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1BT" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="2kkumeGQ_wK" role="2OqNvi">
                                   <node concept="chp4Y" id="2kkumeGQ_wL" role="cj9EA">
@@ -4443,9 +4443,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2kkumeGQ_wM" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1BT" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2kkumeGQ_wN" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1BU" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4459,14 +4459,14 @@
                                 <ref role="cht4Q" to="x27k:5jyom5fOqJu" resolve="ObjResourceDescriptor" />
                               </node>
                               <node concept="37vLTw" id="2kkumeGQ_wT" role="1m5AlR">
-                                <ref role="3cqZAo" node="2kkumeGQ_wU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1BV" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2kkumeGQ_wU" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1BV" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2kkumeGQ_wV" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1BW" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5176,7 +5176,7 @@
                       <node concept="2OqwBi" id="5Tkpp$X39b6" role="3clFbG">
                         <node concept="2OqwBi" id="5Tkpp$X39b7" role="2Oq$k0">
                           <node concept="37vLTw" id="5Tkpp$X39b8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5Tkpp$X39bb" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1BX" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5Tkpp$X39b9" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:51p726VIDVA" resolve="externalBuilds" />
@@ -5186,9 +5186,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5Tkpp$X39bb" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1BX" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5Tkpp$X39bc" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1BY" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5211,7 +5211,7 @@
                       <node concept="2OqwBi" id="3MG7Fm1z9yI" role="3clFbG">
                         <node concept="2OqwBi" id="3MG7Fm1z5$w" role="2Oq$k0">
                           <node concept="37vLTw" id="3MG7Fm1z5dy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MG7Fm1z4Dh" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1BZ" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="3MG7Fm1z6PG" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:2kkumeGQBlk" resolve="referencedLibs" />
@@ -5221,9 +5221,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3MG7Fm1z4Dh" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1BZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3MG7Fm1z4Di" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1C0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5268,7 +5268,7 @@
                       <node concept="3clFbF" id="2qdxtjtJ0GL" role="3cqZAp">
                         <node concept="2OqwBi" id="2qdxtjtJ0GM" role="3clFbG">
                           <node concept="37vLTw" id="2qdxtjtJ0GN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2qdxtjtJ0GP" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1C1" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2qdxtjtJ32z" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:4JZ_DSv0AAi" resolve="target" />
@@ -5276,9 +5276,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2qdxtjtJ0GP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1C1" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2qdxtjtJ0GQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1C2" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5303,7 +5303,7 @@
                     <node concept="3clFbF" id="2qdxtjtDmaU" role="3cqZAp">
                       <node concept="2OqwBi" id="2qdxtjtDmaV" role="3clFbG">
                         <node concept="37vLTw" id="2qdxtjtDmaW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2qdxtjtDmaZ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1C3" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="2qdxtjtDmaX" role="2OqNvi">
                           <node concept="chp4Y" id="2qdxtjtDmaY" role="cj9EA">
@@ -5313,9 +5313,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2qdxtjtDmaZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1C3" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2qdxtjtDmb0" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1C4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5423,7 +5423,7 @@
                     <node concept="3clFbF" id="2qdxtjtECp0" role="3cqZAp">
                       <node concept="2OqwBi" id="2qdxtjtECp1" role="3clFbG">
                         <node concept="37vLTw" id="2qdxtjtECp2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2qdxtjtECp4" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1C5" resolve="it" />
                         </node>
                         <node concept="liA8E" id="2qdxtjtECp3" role="2OqNvi">
                           <ref role="37wK5l" to="7otb:4JZ_DSvxPO_" resolve="getCrossCompilationToolchain" />
@@ -5431,9 +5431,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2qdxtjtECp4" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1C5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2qdxtjtECp5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1C6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5525,7 +5525,7 @@
                       <node concept="2OqwBi" id="2qdxtjtKxyC" role="3clFbG">
                         <node concept="2OqwBi" id="2qdxtjtKxyD" role="2Oq$k0">
                           <node concept="37vLTw" id="2qdxtjtKxyE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2qdxtjtKxyJ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Cb" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="2qdxtjtKxyF" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:4JZ_DSuWeoL" resolve="supportedTargets" />
@@ -5545,14 +5545,14 @@
                                         <node concept="3clFbF" id="2qdxtju3UlG" role="3cqZAp">
                                           <node concept="2OqwBi" id="2qdxtju3UlH" role="3clFbG">
                                             <node concept="37vLTw" id="2qdxtju3UlI" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2qdxtju3UlQ" resolve="supportedTarget" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1C9" resolve="supportedTarget" />
                                             </node>
                                             <node concept="1mIQ4w" id="2qdxtju3UlJ" role="2OqNvi">
                                               <node concept="25Kdxt" id="2qdxtju3UlK" role="cj9EA">
                                                 <node concept="2OqwBi" id="2qdxtju3UlL" role="25KhWn">
                                                   <node concept="2yIwOk" id="2qdxtju3UlM" role="2OqNvi" />
                                                   <node concept="37vLTw" id="2qdxtju3WKb" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="2qdxtju3UlO" resolve="usedTarget" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1C7" resolve="usedTarget" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -5560,27 +5560,27 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2qdxtju3UlO" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1C7" role="1bW2Oz">
                                         <property role="TrG5h" value="usedTarget" />
-                                        <node concept="2jxLKc" id="2qdxtju3UlP" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1C8" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2qdxtju3UlQ" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1C9" role="1bW2Oz">
                               <property role="TrG5h" value="supportedTarget" />
-                              <node concept="2jxLKc" id="2qdxtju3UlR" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Ca" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2qdxtjtKxyJ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Cb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2qdxtjtKxyK" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Cc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5618,7 +5618,7 @@
                       <node concept="2OqwBi" id="6VpLvM97NdL" role="3clFbG">
                         <node concept="2OqwBi" id="6VpLvM97K64" role="2Oq$k0">
                           <node concept="37vLTw" id="6VpLvM97J_U" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6VpLvM97IlE" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Ch" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6VpLvM97Km1" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:4JZ_DSuWeoL" resolve="supportedTargets" />
@@ -5639,7 +5639,7 @@
                                           <node concept="2OqwBi" id="6VpLvM9l_ak" role="3clFbG">
                                             <node concept="2OqwBi" id="6VpLvM9ky7Q" role="2Oq$k0">
                                               <node concept="37vLTw" id="6VpLvM9ja5s" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6VpLvM9cY2H" resolve="supportedTarget" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1Cf" resolve="supportedTarget" />
                                               </node>
                                               <node concept="2yIwOk" id="6VpLvM9k$07" role="2OqNvi" />
                                             </node>
@@ -5647,7 +5647,7 @@
                                               <node concept="25Kdxt" id="6VpLvM9lCog" role="3QVz_e">
                                                 <node concept="2OqwBi" id="6VpLvM9lFoJ" role="25KhWn">
                                                   <node concept="37vLTw" id="6VpLvM9lDK4" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="6VpLvM9j3_5" resolve="configuredTarget" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1Cd" resolve="configuredTarget" />
                                                   </node>
                                                   <node concept="2yIwOk" id="6VpLvM9lFKn" role="2OqNvi" />
                                                 </node>
@@ -5656,27 +5656,27 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="6VpLvM9j3_5" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1Cd" role="1bW2Oz">
                                         <property role="TrG5h" value="configuredTarget" />
-                                        <node concept="2jxLKc" id="6VpLvM9j3_6" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1Ce" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6VpLvM9cY2H" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Cf" role="1bW2Oz">
                               <property role="TrG5h" value="supportedTarget" />
-                              <node concept="2jxLKc" id="6VpLvM9cY2I" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Cg" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6VpLvM97IlE" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ch" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6VpLvM97IlF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ci" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7977,7 +7977,7 @@
                               <ref role="3cqZAo" node="2obGnlS341R" resolve="s" />
                             </node>
                             <node concept="37vLTw" id="2obGnlS341Q" role="3uHU7w">
-                              <ref role="3cqZAo" node="2obGnlS341T" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Cj" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -7987,9 +7987,9 @@
                       <property role="TrG5h" value="s" />
                       <node concept="17QB3L" id="2obGnlS341S" role="1tU5fm" />
                     </node>
-                    <node concept="Rh6nW" id="2obGnlS341T" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Cj" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2obGnlS341U" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ck" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="Xl_RD" id="2obGnlS341V" role="1MDeny">
@@ -8325,7 +8325,7 @@
                                           <node concept="3clFbF" id="5VUggFFmLrk" role="3cqZAp">
                                             <node concept="2OqwBi" id="5VUggFFmMic" role="3clFbG">
                                               <node concept="37vLTw" id="5VUggFFmLrj" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5VUggFFmKBe" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1Cl" resolve="it" />
                                               </node>
                                               <node concept="liA8E" id="5VUggFFmO4P" role="2OqNvi">
                                                 <ref role="37wK5l" to="et5u:~IMessage.getText()" resolve="getText" />
@@ -8333,9 +8333,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="5VUggFFmKBe" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN1Cl" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="5VUggFFmKBf" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN1Cm" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -8387,7 +8387,7 @@
                                             <node concept="3clFbF" id="5VUggFFmUwu" role="3cqZAp">
                                               <node concept="2OqwBi" id="5VUggFFmUwv" role="3clFbG">
                                                 <node concept="37vLTw" id="5VUggFFmUww" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="5VUggFFmUwy" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Cn" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="5VUggFFmUwx" role="2OqNvi">
                                                   <ref role="37wK5l" to="et5u:~IMessage.getText()" resolve="getText" />
@@ -8395,9 +8395,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="5VUggFFmUwy" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN1Cn" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="5VUggFFmUwz" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN1Co" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -11109,7 +11109,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
                                   <node concept="2OqwBi" id="3JWussfkbJY" role="37wK5m">
                                     <node concept="37vLTw" id="3JWussfkbJZ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3JWussfl3QK" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Cp" resolve="it" />
                                     </node>
                                     <node concept="3AV6Ez" id="3JWussfkbK0" role="2OqNvi" />
                                   </node>
@@ -11118,7 +11118,7 @@
                               <node concept="2OqwBi" id="3JWussfl3QI" role="3uHU7B">
                                 <node concept="2OqwBi" id="3JWussfkbK1" role="2Oq$k0">
                                   <node concept="37vLTw" id="3JWussfkbK2" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3JWussfl3QK" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Cp" resolve="it" />
                                   </node>
                                   <node concept="3AV6Ez" id="3JWussfkbK3" role="2OqNvi" />
                                 </node>
@@ -11127,9 +11127,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3JWussfl3QK" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Cp" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3JWussfl3QL" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Cq" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -11143,16 +11143,16 @@
                         <node concept="3clFbF" id="3JWussfl3QQ" role="3cqZAp">
                           <node concept="3K4zz7" id="3JWussfl3QR" role="3clFbG">
                             <node concept="37vLTw" id="3JWussfl3QS" role="3K4E3e">
-                              <ref role="3cqZAo" node="3JWussfl3R3" resolve="a" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Cr" resolve="a" />
                             </node>
                             <node concept="37vLTw" id="3JWussfl3QT" role="3K4GZi">
-                              <ref role="3cqZAo" node="3JWussfl3R5" resolve="b" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ct" resolve="b" />
                             </node>
                             <node concept="3eOSWO" id="3JWussfl3QU" role="3K4Cdx">
                               <node concept="2OqwBi" id="3JWussfl3QV" role="3uHU7B">
                                 <node concept="2OqwBi" id="3JWussfl3QW" role="2Oq$k0">
                                   <node concept="37vLTw" id="3JWussfl3QX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3JWussfl3R3" resolve="a" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Cr" resolve="a" />
                                   </node>
                                   <node concept="3AV6Ez" id="3JWussfkgow" role="2OqNvi" />
                                 </node>
@@ -11163,7 +11163,7 @@
                               <node concept="2OqwBi" id="3JWussfl3QZ" role="3uHU7w">
                                 <node concept="2OqwBi" id="3JWussfl3R0" role="2Oq$k0">
                                   <node concept="37vLTw" id="3JWussfl3R1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3JWussfl3R5" resolve="b" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Ct" resolve="b" />
                                   </node>
                                   <node concept="3AV6Ez" id="3JWussfkkXA" role="2OqNvi" />
                                 </node>
@@ -11175,13 +11175,13 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3JWussfl3R3" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Cr" role="1bW2Oz">
                         <property role="TrG5h" value="a" />
-                        <node concept="2jxLKc" id="3JWussfl3R4" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Cs" role="1tU5fm" />
                       </node>
-                      <node concept="Rh6nW" id="3JWussfl3R5" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ct" role="1bW2Oz">
                         <property role="TrG5h" value="b" />
-                        <node concept="2jxLKc" id="3JWussfl3R6" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Cu" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -12198,7 +12198,7 @@
                               <node concept="3clFbF" id="6TPUpoBq9MN" role="3cqZAp">
                                 <node concept="2OqwBi" id="6TPUpoBq9MO" role="3clFbG">
                                   <node concept="37vLTw" id="6TPUpoBq9MP" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6TPUpoBq9MR" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Cv" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="6TPUpoBq9MQ" role="2OqNvi">
                                     <ref role="37wK5l" to="guwi:~File.isDirectory()" resolve="isDirectory" />
@@ -12206,9 +12206,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6TPUpoBq9MR" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Cv" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6TPUpoBq9MS" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Cw" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -12228,7 +12228,7 @@
                                 <node concept="17R0WA" id="6TPUpoBq9N1" role="3clFbG">
                                   <node concept="2OqwBi" id="6TPUpoBq9N2" role="3uHU7B">
                                     <node concept="37vLTw" id="6TPUpoBq9N3" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6TPUpoBq9N6" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Cx" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="6TPUpoBq9N4" role="2OqNvi">
                                       <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
@@ -12240,9 +12240,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6TPUpoBq9N6" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Cx" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6TPUpoBq9N7" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Cy" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -12258,7 +12258,7 @@
                                 <node concept="17R0WA" id="6TPUpoBq9Ne" role="3clFbG">
                                   <node concept="2OqwBi" id="6TPUpoBq9Nf" role="3uHU7B">
                                     <node concept="37vLTw" id="6TPUpoBq9Ng" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6TPUpoBq9Nj" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Cz" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="6TPUpoBq9Nh" role="2OqNvi">
                                       <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
@@ -12270,9 +12270,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6TPUpoBq9Nj" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Cz" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6TPUpoBq9Nk" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1C$" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/constraints.mps
index 48e85434c66..84f08d8f605 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/constraints.mps
@@ -87,7 +87,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -129,6 +129,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -214,7 +215,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -232,7 +233,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -663,7 +663,7 @@
                     <node concept="3clFbF" id="6VpLvM937VJ" role="3cqZAp">
                       <node concept="2OqwBi" id="6VpLvM937VK" role="3clFbG">
                         <node concept="37vLTw" id="6VpLvM937VL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6VpLvM937VN" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1C_" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="6VpLvM937VM" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4JZ_DSuWeoL" resolve="supportedTargets" />
@@ -671,9 +671,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6VpLvM937VN" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1C_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6VpLvM937VO" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1CA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -685,7 +685,7 @@
                     <node concept="2OqwBi" id="6VpLvM93IOh" role="3clFbG">
                       <node concept="2OqwBi" id="6VpLvM93H5l" role="2Oq$k0">
                         <node concept="37vLTw" id="6VpLvM93dqJ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6VpLvM93bZz" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1CB" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="6VpLvM93Ir3" role="2OqNvi" />
                       </node>
@@ -697,9 +697,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6VpLvM93bZz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1CB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6VpLvM93bZ$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1CC" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/editor.mps
index 7facc361b67..e817e961753 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:03a6131a-45fb-41fe-997e-86ce9462eaef(com.mbeddr.core.buildconfig.editor)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
@@ -38,7 +38,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -63,7 +63,7 @@
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
@@ -105,12 +105,12 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -126,7 +126,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -150,7 +150,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -184,7 +184,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -273,7 +273,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -291,7 +291,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -306,6 +306,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -380,7 +381,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -395,7 +396,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -2676,7 +2676,7 @@
                                                 </node>
                                                 <node concept="2OqwBi" id="6YdXqDMyEN" role="3uHU7B">
                                                   <node concept="37vLTw" id="6YdXqDMyuf" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="6YdXqDMym_" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1CD" resolve="it" />
                                                   </node>
                                                   <node concept="3TrcHB" id="6YdXqDMyY3" role="2OqNvi">
                                                     <ref role="3TsBF5" to="51wr:35Yirdv2Bka" resolve="variable" />
@@ -2685,9 +2685,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="6YdXqDMym_" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN1CD" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="6YdXqDMymA" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN1CE" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -2707,7 +2707,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="6YdXqDM_yL" role="37vLTJ">
                                                 <node concept="37vLTw" id="6YdXqDM_nZ" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6YdXqDM_b0" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1CF" resolve="it" />
                                                 </node>
                                                 <node concept="3TrcHB" id="6YdXqDMA7k" role="2OqNvi">
                                                   <ref role="3TsBF5" to="51wr:35Yirdv2GSi" resolve="defaultPrefix" />
@@ -2716,9 +2716,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="6YdXqDM_b0" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN1CF" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="6YdXqDM_b1" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN1CG" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -3128,7 +3128,7 @@
                                                 </node>
                                                 <node concept="2OqwBi" id="6JuSvlsZ8sc" role="3uHU7B">
                                                   <node concept="37vLTw" id="6JuSvlsZ8sd" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="6JuSvlsZ8sf" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1CH" resolve="it" />
                                                   </node>
                                                   <node concept="3TrcHB" id="6JuSvlsZ8se" role="2OqNvi">
                                                     <ref role="3TsBF5" to="51wr:6JuSvlsZ4zJ" resolve="variable" />
@@ -3137,9 +3137,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="6JuSvlsZ8sf" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN1CH" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="6JuSvlsZ8sg" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN1CI" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -3159,7 +3159,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="6JuSvlsZ8sp" role="37vLTJ">
                                                 <node concept="37vLTw" id="6JuSvlsZ8sq" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6JuSvlsZ8ss" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1CJ" resolve="it" />
                                                 </node>
                                                 <node concept="3TrcHB" id="6JuSvlsZ8sr" role="2OqNvi">
                                                   <ref role="3TsBF5" to="51wr:6JuSvlsZ4zK" resolve="defaultPrefix" />
@@ -3168,9 +3168,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="6JuSvlsZ8ss" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN1CJ" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="6JuSvlsZ8st" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN1CK" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/intentions.mps
index 35442003ab1..5747322637b 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/intentions.mps
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -119,6 +119,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -218,7 +219,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -252,7 +253,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -978,7 +978,7 @@
                       <node concept="3clFbF" id="6LsWDiKl12A" role="3cqZAp">
                         <node concept="2OqwBi" id="6LsWDiKl1VI" role="3clFbG">
                           <node concept="37vLTw" id="6LsWDiKl12_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6LsWDiKl0a3" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1CL" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6LsWDiKl395" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -986,9 +986,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6LsWDiKl0a3" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1CL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6LsWDiKl0a4" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1CM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/migration.mps
index ee18602e38f..6d3779db7f4 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,7 +113,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -129,6 +129,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -228,7 +229,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -262,7 +263,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -326,7 +326,7 @@
                           </node>
                           <node concept="2OqwBi" id="1tTyxbTmmGb" role="37vLTJ">
                             <node concept="37vLTw" id="1tTyxbTmm$D" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1tTyxbTmmvp" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1DP" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1tTyxbTmmZ7" role="2OqNvi">
                               <ref role="3TsBF5" to="51wr:1tTyxbTm6yO" resolve="linkerOptions" />
@@ -335,9 +335,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1tTyxbTmmvp" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1DP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1tTyxbTmmvq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1DQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -430,7 +430,7 @@
                               <node concept="2OqwBi" id="NotiROhWK$" role="3clFbG">
                                 <node concept="2OqwBi" id="NotiROhWK_" role="2Oq$k0">
                                   <node concept="37vLTw" id="NotiROhWKA" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="NotiROhWKG" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1DR" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="NotiROhWKB" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -451,9 +451,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="NotiROhWKG" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1DR" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="NotiROhWKH" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1DS" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -502,7 +502,7 @@
                               <node concept="2OqwBi" id="NotiROi1lO" role="3clFbG">
                                 <node concept="2OqwBi" id="NotiROi1lP" role="2Oq$k0">
                                   <node concept="37vLTw" id="NotiROi1lQ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="NotiROi1lW" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1DT" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="NotiROi1lR" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -523,9 +523,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="NotiROi1lW" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1DT" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="NotiROi1lX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1DU" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -574,7 +574,7 @@
                               <node concept="2OqwBi" id="NotiROi63H" role="3clFbG">
                                 <node concept="2OqwBi" id="NotiROi63I" role="2Oq$k0">
                                   <node concept="37vLTw" id="NotiROi63J" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="NotiROi63P" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1DV" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="NotiROi63K" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -595,9 +595,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="NotiROi63P" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1DV" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="NotiROi63Q" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1DW" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -646,7 +646,7 @@
                               <node concept="2OqwBi" id="NotiROiaJW" role="3clFbG">
                                 <node concept="2OqwBi" id="NotiROiaJX" role="2Oq$k0">
                                   <node concept="37vLTw" id="NotiROiaJY" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="NotiROiaK4" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1DX" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="NotiROiaJZ" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -667,9 +667,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="NotiROiaK4" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1DX" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="NotiROiaK5" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1DY" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -768,7 +768,7 @@
                                         <node concept="2OqwBi" id="3WDf4KPmLZc" role="3clFbG">
                                           <node concept="2OqwBi" id="3WDf4KPmLZd" role="2Oq$k0">
                                             <node concept="37vLTw" id="3WDf4KPmLZe" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3WDf4KPmLZi" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1DZ" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="3WDf4KPmLZf" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -789,9 +789,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3WDf4KPmLZi" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1DZ" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="3WDf4KPmLZj" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1E0" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -892,7 +892,7 @@
                                 <node concept="2OqwBi" id="NotiROihCn" role="3clFbG">
                                   <node concept="2OqwBi" id="NotiROihCo" role="2Oq$k0">
                                     <node concept="37vLTw" id="NotiROihCp" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="NotiROihCv" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1E1" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="NotiROihCq" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -913,9 +913,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="NotiROihCv" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1E1" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="NotiROihCw" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1E2" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1005,7 +1005,7 @@
                               <node concept="2OqwBi" id="5Dpaey8vmq7" role="3clFbG">
                                 <node concept="2OqwBi" id="5Dpaey8vmq8" role="2Oq$k0">
                                   <node concept="37vLTw" id="5Dpaey8vmq9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5Dpaey8vmqd" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1E3" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="5Dpaey8vmqa" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1026,9 +1026,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5Dpaey8vmqd" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1E3" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5Dpaey8vmqe" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1E4" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1119,7 +1119,7 @@
                               <node concept="2OqwBi" id="5Dpaey8vuzM" role="3clFbG">
                                 <node concept="2OqwBi" id="5Dpaey8vuzN" role="2Oq$k0">
                                   <node concept="37vLTw" id="5Dpaey8vuzO" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5Dpaey8vuzS" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1E5" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="5Dpaey8vuzP" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1140,9 +1140,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5Dpaey8vuzS" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1E5" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5Dpaey8vuzT" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1E6" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1233,7 +1233,7 @@
                               <node concept="2OqwBi" id="5Dpaey8vC$f" role="3clFbG">
                                 <node concept="2OqwBi" id="5Dpaey8vC$g" role="2Oq$k0">
                                   <node concept="37vLTw" id="5Dpaey8vC$h" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5Dpaey8vC$l" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1E7" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="5Dpaey8vC$i" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1254,9 +1254,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5Dpaey8vC$l" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1E7" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5Dpaey8vC$m" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1E8" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1410,7 +1410,7 @@
                                         <node concept="2OqwBi" id="6jIUNx3ApNY" role="3clFbG">
                                           <node concept="2OqwBi" id="6jIUNx3ApNZ" role="2Oq$k0">
                                             <node concept="37vLTw" id="6jIUNx3ApO0" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6jIUNx3ApO4" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1E9" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="6jIUNx3ApO1" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1431,9 +1431,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6jIUNx3ApO4" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1E9" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6jIUNx3ApO5" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Ea" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1838,7 +1838,7 @@
                           <node concept="3clFbT" id="64pi6e6cu3j" role="37vLTx" />
                           <node concept="2OqwBi" id="64pi6e6cl4C" role="37vLTJ">
                             <node concept="37vLTw" id="64pi6e6ckOA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="64pi6e6ckHl" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Eb" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="64pi6e6cpB5" role="2OqNvi">
                               <ref role="3TsBF5" to="51wr:2YvytGXjVmW" resolve="isTest" />
@@ -1847,9 +1847,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="64pi6e6ckHl" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Eb" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="64pi6e6ckHm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ec" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2279,15 +2279,15 @@
                           <node concept="3clFbF" id="4JZ_DSvOHxz" role="3cqZAp">
                             <node concept="2OqwBi" id="4JZ_DSvOHx_" role="3clFbG">
                               <node concept="37vLTw" id="4JZ_DSvOHxA" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4JZ_DSvOHxG" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ed" resolve="it" />
                               </node>
                               <node concept="3YRAZt" id="4JZ_DSvOHQN" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4JZ_DSvOHxG" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Ed" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4JZ_DSvOHxH" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Ee" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2408,7 +2408,7 @@
                               <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
                               <node concept="2OqwBi" id="35Yirdv2RpD" role="37wK5m">
                                 <node concept="37vLTw" id="35Yirdv2RpE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="35Yirdv2L02" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ef" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="35Yirdv2RpF" role="2OqNvi">
                                   <ref role="3TsBF5" to="68mc:5lKnBeAtODI" resolve="path" />
@@ -2435,7 +2435,7 @@
                               </node>
                               <node concept="2OqwBi" id="35Yirdv2LDP" role="37vLTJ">
                                 <node concept="37vLTw" id="35Yirdv2Lu$" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="35Yirdv2L02" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ef" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="35Yirdv2M1u" role="2OqNvi">
                                   <ref role="3TsBF5" to="51wr:35Yirdv2Bka" resolve="variable" />
@@ -2458,7 +2458,7 @@
                               </node>
                               <node concept="2OqwBi" id="35Yirdv2WDe" role="37vLTJ">
                                 <node concept="37vLTw" id="35Yirdv2Wnh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="35Yirdv2L02" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ef" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="35Yirdv2X4P" role="2OqNvi">
                                   <ref role="3TsBF5" to="68mc:5lKnBeAtODI" resolve="path" />
@@ -2480,7 +2480,7 @@
                             <node concept="3clFbF" id="6NFEZ$q7FQP" role="3cqZAp">
                               <node concept="2OqwBi" id="6NFEZ$q7G8T" role="3clFbG">
                                 <node concept="37vLTw" id="6NFEZ$q7FQO" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="35Yirdv2L02" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ef" resolve="it" />
                                 </node>
                                 <node concept="1P9Npp" id="6NFEZ$q7GFl" role="2OqNvi">
                                   <node concept="2pJPEk" id="6NFEZ$qpsMl" role="1P9ThW">
@@ -2491,7 +2491,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfT8" role="28ntcv">
                                           <node concept="2OqwBi" id="6NFEZ$qptI9" role="WxPPp">
                                             <node concept="37vLTw" id="6NFEZ$qptrC" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="35Yirdv2L02" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Ef" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="6NFEZ$qpufu" role="2OqNvi">
                                               <ref role="3TsBF5" to="68mc:5lKnBeAtODI" resolve="path" />
@@ -2508,9 +2508,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="35Yirdv2L02" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ef" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="35Yirdv2L03" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Eg" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2607,7 +2607,7 @@
                           </node>
                           <node concept="2OqwBi" id="7B3zdKLp79P" role="37vLTJ">
                             <node concept="37vLTw" id="7B3zdKLp79Q" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7B3zdKLp79S" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Eh" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="7B3zdKLp7R0" role="2OqNvi">
                               <ref role="3TsBF5" to="51wr:7B3zdKLlio4" resolve="linker" />
@@ -2616,9 +2616,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7B3zdKLp79S" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Eh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7B3zdKLp79T" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ei" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2712,7 +2712,7 @@
                         <node concept="37vLTI" id="3S4xuxhQAES" role="3clFbG">
                           <node concept="2OqwBi" id="3S4xuxhQ_3W" role="37vLTJ">
                             <node concept="37vLTw" id="3S4xuxhQ$Od" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3S4xuxhQvu2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ej" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3S4xuxhQA64" role="2OqNvi">
                               <ref role="3TsBF5" to="51wr:15AovGF$F2T" resolve="cppCompiler" />
@@ -2727,7 +2727,7 @@
                         <node concept="37vLTI" id="3S4xuxhQxXb" role="3clFbG">
                           <node concept="2OqwBi" id="3S4xuxhQwVJ" role="37vLTJ">
                             <node concept="37vLTw" id="3S4xuxhQwvP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3S4xuxhQvu2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ej" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3S4xuxhQxxi" role="2OqNvi">
                               <ref role="3TsBF5" to="51wr:15AovGF$F32" resolve="cppCompilerOptions" />
@@ -2742,7 +2742,7 @@
                         <node concept="37vLTI" id="3S4xuxhQvtX" role="3clFbG">
                           <node concept="2OqwBi" id="3S4xuxhQvtZ" role="37vLTJ">
                             <node concept="37vLTw" id="3S4xuxhQvu0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3S4xuxhQvu2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ej" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3S4xuxhQwfp" role="2OqNvi">
                               <ref role="3TsBF5" to="51wr:7B3zdKLlio4" resolve="linker" />
@@ -2752,9 +2752,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3S4xuxhQvu2" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ej" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3S4xuxhQvu3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ek" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
index 1e5c56e62a4..3a1d05cbaa6 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
@@ -61,7 +61,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -134,7 +134,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -154,7 +154,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -187,6 +187,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -326,7 +327,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -357,7 +358,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -611,7 +611,7 @@
                         <node concept="2OqwBi" id="2obGnlRxkGv" role="1u1ALf">
                           <node concept="2OqwBi" id="2obGnlRxbXt" role="2Oq$k0">
                             <node concept="37vLTw" id="6TPUpoHbAcf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2obGnlRg4rH" resolve="inputItem" />
+                              <ref role="3cqZAo" node="2SR9xrsN1CP" resolve="inputItem" />
                             </node>
                             <node concept="2sxana" id="2obGnlRxheB" role="2OqNvi">
                               <ref role="2sxfKC" to="fn29:1Xl3kQ1uadN" resolve="models" />
@@ -633,7 +633,7 @@
                                     <property role="TrG5h" value="model" />
                                     <node concept="H_c77" id="2obGnlRg4rD" role="1tU5fm" />
                                     <node concept="37vLTw" id="2obGnlRg4rE" role="33vP2m">
-                                      <ref role="3cqZAo" node="2obGnlRg4rF" resolve="m" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1CN" resolve="m" />
                                     </node>
                                   </node>
                                 </node>
@@ -704,7 +704,7 @@
                                                     </node>
                                                     <node concept="2OqwBi" id="5Hxjapwed46" role="2Oq$k0">
                                                       <node concept="37vLTw" id="6TPUpoHbAce" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="2obGnlRg4rH" resolve="inputItem" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN1CP" resolve="inputItem" />
                                                       </node>
                                                       <node concept="2sxana" id="5Hxjapwed48" role="2OqNvi">
                                                         <ref role="2sxfKC" to="fn29:1Xl3kQ1uadL" resolve="module" />
@@ -929,15 +929,15 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2obGnlRg4rF" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1CN" role="1bW2Oz">
                                 <property role="TrG5h" value="m" />
-                                <node concept="2jxLKc" id="2obGnlRg4rG" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1CO" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                           <node concept="2OqwBi" id="2obGnlRg4rx" role="2Oq$k0">
                             <node concept="37vLTw" id="6TPUpoHbAcd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2obGnlRg4rH" resolve="inputItem" />
+                              <ref role="3cqZAo" node="2SR9xrsN1CP" resolve="inputItem" />
                             </node>
                             <node concept="2sxana" id="2obGnlRg4rz" role="2OqNvi">
                               <ref role="2sxfKC" to="fn29:1Xl3kQ1uadN" resolve="models" />
@@ -955,9 +955,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2obGnlRg4rH" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1CP" role="1bW2Oz">
                       <property role="TrG5h" value="inputItem" />
-                      <node concept="2jxLKc" id="2obGnlRg4rI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1CQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1234,7 +1234,7 @@
                                   <node concept="3clFbF" id="4zXqh6VIjEv" role="3cqZAp">
                                     <node concept="2OqwBi" id="4zXqh6VIjEw" role="3clFbG">
                                       <node concept="37vLTw" id="4zXqh6VIjEx" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4zXqh6VIjEz" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1CR" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4zXqh6VIjEy" role="2OqNvi">
                                         <ref role="3Tt5mk" to="k146:3R$6B6bKEUv" resolve="strategy" />
@@ -1242,9 +1242,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4zXqh6VIjEz" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1CR" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4zXqh6VIjE$" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1CS" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/scripts.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/scripts.mps
index b08577e1aa0..83f6192cbdf 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/scripts.mps
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps
index 2f5c04e277a..99717de410e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps
@@ -83,7 +83,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/typesystem.mps
index 8ea11d2df94..94cefa0ef2e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/typesystem.mps
@@ -45,7 +45,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -138,7 +138,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -159,7 +159,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -176,6 +176,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -341,7 +342,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -382,7 +383,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -501,7 +501,7 @@
                                         <ref role="cht4Q" to="x27k:2MbfxrZI9YU" resolve="IMayActAsMainFunction" />
                                       </node>
                                       <node concept="37vLTw" id="1BZ0lgDLvtG" role="1m5AlR">
-                                        <ref role="3cqZAo" node="1BZ0lgDLvtu" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1CT" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="2MbfxrZIb7j" role="2OqNvi">
@@ -510,7 +510,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="1BZ0lgDLvty" role="3uHU7B">
                                     <node concept="37vLTw" id="1BZ0lgDLvtx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1BZ0lgDLvtu" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1CT" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="1BZ0lgDLvtA" role="2OqNvi">
                                       <node concept="chp4Y" id="2MbfxrZIb7g" role="cj9EA">
@@ -521,9 +521,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1BZ0lgDLvtu" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1CT" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1BZ0lgDLvtv" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1CU" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -718,7 +718,7 @@
                       <node concept="3clFbF" id="94IdDJCpuz" role="3cqZAp">
                         <node concept="2OqwBi" id="94IdDJCpJW" role="3clFbG">
                           <node concept="37vLTw" id="94IdDJCpuy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="94IdDJCoMM" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1CV" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="94IdDJCteE" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -726,9 +726,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="94IdDJCoMM" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1CV" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="94IdDJCoMN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1CW" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -847,7 +847,7 @@
                                       <ref role="3TsBF5" to="tpce:4qF2Hm2r7ja" resolve="conceptAlias" />
                                     </node>
                                     <node concept="37vLTw" id="5Hxjapwgu9k" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3Ulkr59MgbV" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1CX" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3cpWs3" id="3Ulkr59Mgcw" role="3uHU7B">
@@ -865,9 +865,9 @@
                               <property role="TrG5h" value="s" />
                               <node concept="17QB3L" id="3Ulkr59Mgc3" role="1tU5fm" />
                             </node>
-                            <node concept="Rh6nW" id="3Ulkr59MgbV" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1CX" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3Ulkr59MgbW" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1CY" role="1tU5fm" />
                             </node>
                           </node>
                           <node concept="Xl_RD" id="3Ulkr59Mgc0" role="1MDeny">
@@ -1007,13 +1007,13 @@
                         <property role="Xl_RC" value="only a single library, a single executable or many executables are allowed" />
                       </node>
                       <node concept="37vLTw" id="7Aba6Bzgybx" role="1urrMF">
-                        <ref role="3cqZAo" node="7Aba6BzgwQm" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1CZ" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7Aba6BzgwQm" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1CZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7Aba6BzgwQn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1D0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1052,7 +1052,7 @@
                   <node concept="3clFbF" id="7Aba6ByD3Ac" role="3cqZAp">
                     <node concept="2OqwBi" id="7Aba6ByD4u6" role="3clFbG">
                       <node concept="37vLTw" id="7Aba6ByD3Ab" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7Aba6ByCJrJ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1D1" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="7Aba6ByD7lE" role="2OqNvi">
                         <node concept="chp4Y" id="7Aba6ByD8_i" role="cj9EA">
@@ -1062,9 +1062,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7Aba6ByCJrJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1D1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7Aba6ByCJrK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1D2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1098,7 +1098,7 @@
                               <node concept="2OqwBi" id="ybcgwyxu1c" role="2Oq$k0">
                                 <node concept="2OqwBi" id="ybcgwyxu1d" role="2Oq$k0">
                                   <node concept="37vLTw" id="ybcgwyxu1e" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="ybcgwyxu1q" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1D5" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="ybcgwyxu1f" role="2OqNvi">
                                     <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -1114,24 +1114,24 @@
                                     <node concept="3clFbF" id="ybcgwyxu1k" role="3cqZAp">
                                       <node concept="2OqwBi" id="ybcgwyxu1l" role="3clFbG">
                                         <node concept="37vLTw" id="ybcgwyxu1m" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="ybcgwyxu1o" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1D3" resolve="it" />
                                         </node>
                                         <node concept="I4A8Y" id="ybcgwyxu1n" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="ybcgwyxu1o" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1D3" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="ybcgwyxu1p" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1D4" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="ybcgwyxu1q" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1D5" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="ybcgwyxu1r" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1D6" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1150,14 +1150,14 @@
                             <node concept="I4A8Y" id="ybcgwyxu1$" role="2OqNvi" />
                           </node>
                           <node concept="37vLTw" id="ybcgwyxu1_" role="3uHU7B">
-                            <ref role="3cqZAo" node="ybcgwyxu1A" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1D7" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="ybcgwyxu1A" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1D7" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="ybcgwyxu1B" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1D8" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1201,15 +1201,15 @@
                           <ref role="37wK5l" to="zgpd:3juJO4ZFikw" resolve="isXModelGen" />
                           <ref role="1Pybhc" to="zgpd:3juJO4ZFi8K" resolve="GenerationHelper" />
                           <node concept="37vLTw" id="ybcgwyxvrG" role="37wK5m">
-                            <ref role="3cqZAo" node="ybcgwyxvbA" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1D9" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="ybcgwyxvbA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1D9" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="ybcgwyxvbB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Da" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1234,7 +1234,7 @@
                         <node concept="2OqwBi" id="ybcgwyxINc" role="3clFbG">
                           <node concept="2OqwBi" id="ybcgwyxINd" role="2Oq$k0">
                             <node concept="37vLTw" id="ybcgwyxINe" role="2Oq$k0">
-                              <ref role="3cqZAo" node="ybcgwyxINh" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Db" resolve="it" />
                             </node>
                             <node concept="2RRcyG" id="ybcgwyxINf" role="2OqNvi">
                               <node concept="chp4Y" id="34w7WGUSF10" role="3MHsoP">
@@ -1246,9 +1246,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="ybcgwyxINh" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Db" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="ybcgwyxINi" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Dc" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1280,7 +1280,7 @@
                             <node concept="2OqwBi" id="ybcgwyy7Xf" role="3clFbG">
                               <node concept="2OqwBi" id="ybcgwyy7Xg" role="2Oq$k0">
                                 <node concept="37vLTw" id="ybcgwyy7Xh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="ybcgwyy7Xw" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Df" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="ybcgwyy7Xi" role="2OqNvi">
                                   <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
@@ -1292,7 +1292,7 @@
                                     <node concept="3clFbF" id="ybcgwyy7Xm" role="3cqZAp">
                                       <node concept="2OqwBi" id="ybcgwyy7Xn" role="3clFbG">
                                         <node concept="37vLTw" id="ybcgwyy7Xo" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="ybcgwyy7Xu" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Dd" resolve="it" />
                                         </node>
                                         <node concept="1mIQ4w" id="ybcgwyy7Xp" role="2OqNvi">
                                           <node concept="25Kdxt" id="ybcgwyy7Xq" role="cj9EA">
@@ -1307,18 +1307,18 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="ybcgwyy7Xu" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1Dd" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="ybcgwyy7Xv" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1De" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="ybcgwyy7Xw" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Df" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="ybcgwyy7Xx" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Dg" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1551,7 +1551,7 @@
                             </node>
                             <node concept="2OqwBi" id="6e36ACEvti" role="3uHU7B">
                               <node concept="37vLTw" id="6e36ACEvsX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6e36ACEvsU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Dh" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6e36ACEvto" role="2OqNvi">
                                 <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -1560,9 +1560,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6e36ACEvsU" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Dh" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6e36ACEvsV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Di" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1902,7 +1902,7 @@
                                       <ref role="cht4Q" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
                                     </node>
                                     <node concept="37vLTw" id="6P3AdoduhUa" role="1m5AlR">
-                                      <ref role="3cqZAo" node="6P3Adods5yg" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Dj" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3TrcHB" id="6P3AdodulY4" role="2OqNvi">
@@ -1912,7 +1912,7 @@
                               </node>
                               <node concept="2OqwBi" id="6P3AdodueoU" role="3uHU7B">
                                 <node concept="37vLTw" id="6P3Adodud7m" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6P3Adods5yg" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Dj" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="6P3AdodufzV" role="2OqNvi">
                                   <node concept="chp4Y" id="6P3AdodufOI" role="cj9EA">
@@ -1957,7 +1957,7 @@
                                 <node concept="3fqX7Q" id="6P3AdoeXtWR" role="3uHU7B">
                                   <node concept="2OqwBi" id="6P3AdoeXtWT" role="3fr31v">
                                     <node concept="37vLTw" id="6P3AdoeXtWU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6P3Adods5yg" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Dj" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="6P3AdoeXtWV" role="2OqNvi">
                                       <node concept="chp4Y" id="6P3AdoeXtWW" role="cj9EA">
@@ -1972,7 +1972,7 @@
                                       <ref role="cht4Q" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
                                     </node>
                                     <node concept="37vLTw" id="6P3AdoeXv$L" role="1m5AlR">
-                                      <ref role="3cqZAo" node="6P3Adods5yg" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Dj" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3TrcHB" id="6P3AdoeXv$M" role="2OqNvi">
@@ -1985,9 +1985,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6P3Adods5yg" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Dj" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6P3Adods5yh" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Dk" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2005,7 +2005,7 @@
                             <node concept="2qgKlT" id="5DPGxveQr2S" role="2OqNvi">
                               <ref role="37wK5l" to="qd6m:bnKRyxQ2fZ" resolve="isSameNameAdmissible" />
                               <node concept="37vLTw" id="5DPGxveQr9m" role="37wK5m">
-                                <ref role="3cqZAo" node="6P3Adodr_nG" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Dl" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -2013,7 +2013,7 @@
                         <node concept="17R0WA" id="6P3AdodrFnF" role="3uHU7B">
                           <node concept="2OqwBi" id="6P3AdodrDIB" role="3uHU7B">
                             <node concept="37vLTw" id="6P3AdodrDk0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6P3Adodr_nG" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Dl" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6P3AdodrEwM" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2031,9 +2031,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6P3Adodr_nG" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Dl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6P3Adodr_nH" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Dm" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2295,7 +2295,7 @@
                             </node>
                             <node concept="2OqwBi" id="1R8nNt47Knx" role="3uHU7B">
                               <node concept="37vLTw" id="1R8nNt47K48" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1R8nNt47JRp" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Dn" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="1R8nNt47KUf" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2304,9 +2304,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1R8nNt47JRp" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Dn" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1R8nNt47JRq" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Do" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2424,7 +2424,7 @@
                     <node concept="3clFbF" id="3GFY9ZnaJGm" role="3cqZAp">
                       <node concept="2OqwBi" id="3GFY9ZnaJGn" role="3clFbG">
                         <node concept="37vLTw" id="3GFY9ZnaJGo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3GFY9ZnaJGq" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Dp" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3GFY9ZnaJGp" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -2432,9 +2432,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3GFY9ZnaJGq" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Dp" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3GFY9ZnaJGr" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Dq" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2462,7 +2462,7 @@
                         <node concept="3y3z36" id="3bXXt3METBJ" role="3uHU7B">
                           <node concept="10Nm6u" id="3bXXt3METC4" role="3uHU7w" />
                           <node concept="37vLTw" id="3bXXt3METac" role="3uHU7B">
-                            <ref role="3cqZAo" node="3GFY9Znbfiz" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Dr" resolve="it" />
                           </node>
                         </node>
                         <node concept="3fqX7Q" id="3GFY9ZnjyGi" role="3uHU7w">
@@ -2470,7 +2470,7 @@
                             <node concept="2OqwBi" id="3GFY9ZnjyGl" role="2Oq$k0">
                               <node concept="2OqwBi" id="3GFY9ZnjyGm" role="2Oq$k0">
                                 <node concept="37vLTw" id="3GFY9ZnjyGn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3GFY9Znbfiz" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Dr" resolve="it" />
                                 </node>
                                 <node concept="I4A8Y" id="3GFY9ZnjyGo" role="2OqNvi" />
                               </node>
@@ -2490,9 +2490,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3GFY9Znbfiz" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Dr" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3GFY9Znbfi$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ds" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2566,15 +2566,15 @@
                       <node concept="3clFbF" id="3GFY9ZnhPVm" role="3cqZAp">
                         <node concept="2OqwBi" id="3GFY9ZnhPVn" role="3clFbG">
                           <node concept="37vLTw" id="3GFY9ZnhPVo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3GFY9ZnhPVq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Dt" resolve="it" />
                           </node>
                           <node concept="I4A8Y" id="3GFY9ZnhPVp" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3GFY9ZnhPVq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Dt" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3GFY9ZnhPVr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Du" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2649,7 +2649,7 @@
                         <node concept="2OqwBi" id="3GFY9ZncPq1" role="3fr31v">
                           <node concept="2OqwBi" id="3GFY9ZncPq2" role="2Oq$k0">
                             <node concept="37vLTw" id="3GFY9ZncPq3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3GFY9ZncPq6" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Dv" resolve="it" />
                             </node>
                             <node concept="liA8E" id="3GFY9ZncPq4" role="2OqNvi">
                               <ref role="37wK5l" to="w1kc:~Language.getGenerators()" resolve="getGenerators" />
@@ -2662,9 +2662,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3GFY9ZncPq6" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Dv" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3GFY9ZncPq7" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Dw" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2884,7 +2884,7 @@
                     <node concept="3clFbF" id="72LMS1i0jP6" role="3cqZAp">
                       <node concept="2OqwBi" id="72LMS1i0jP7" role="3clFbG">
                         <node concept="37vLTw" id="72LMS1i0jP8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="72LMS1i0jPa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Dx" resolve="it" />
                         </node>
                         <node concept="liA8E" id="72LMS1i0jP9" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
@@ -2892,9 +2892,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="72LMS1i0jPa" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Dx" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="72LMS1i0jPb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Dy" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3082,7 +3082,7 @@
                   <node concept="3clFbF" id="56jrqO8IwDg" role="3cqZAp">
                     <node concept="2OqwBi" id="56jrqO8IwRl" role="3clFbG">
                       <node concept="37vLTw" id="56jrqO8IwDf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="56jrqO8Iw_G" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Dz" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="56jrqO8I_7s" role="2OqNvi">
                         <node concept="chp4Y" id="56jrqO8I_u2" role="cj9EA">
@@ -3092,9 +3092,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="56jrqO8Iw_G" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Dz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="56jrqO8Iw_H" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1D$" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3165,7 +3165,7 @@
                     <node concept="3clFbF" id="56jrqO8KlBa" role="3cqZAp">
                       <node concept="2OqwBi" id="56jrqO8KlBb" role="3clFbG">
                         <node concept="37vLTw" id="56jrqO8KlBc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="56jrqO8KlBf" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1D_" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="56jrqO8KlBd" role="2OqNvi">
                           <node concept="chp4Y" id="56jrqO8KlBe" role="cj9EA">
@@ -3175,9 +3175,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="56jrqO8KlBf" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1D_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="56jrqO8KlBg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1DA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3396,7 +3396,7 @@
                   <node concept="3clFbF" id="476OnZonZb1" role="3cqZAp">
                     <node concept="2OqwBi" id="476OnZonZlb" role="3clFbG">
                       <node concept="37vLTw" id="476OnZonZb0" role="2Oq$k0">
-                        <ref role="3cqZAo" node="476OnZonZ0l" resolve="target" />
+                        <ref role="3cqZAo" node="2SR9xrsN1DB" resolve="target" />
                       </node>
                       <node concept="liA8E" id="476OnZoo0oM" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
@@ -3407,9 +3407,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="476OnZonZ0l" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1DB" role="1bW2Oz">
                   <property role="TrG5h" value="target" />
-                  <node concept="2jxLKc" id="476OnZonZ0m" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1DC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3990,7 +3990,7 @@
                     <node concept="3clFbF" id="2VNOnmIIR1n" role="3cqZAp">
                       <node concept="2OqwBi" id="2VNOnmIIR1o" role="3clFbG">
                         <node concept="37vLTw" id="2VNOnmIIR1p" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2VNOnmIIR1t" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1DD" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="2VNOnmIIR1q" role="2OqNvi">
                           <node concept="1xMEDy" id="2VNOnmIIR1r" role="1xVPHs">
@@ -4002,9 +4002,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2VNOnmIIR1t" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1DD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2VNOnmIIR1u" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1DE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4036,15 +4036,15 @@
                     <node concept="3clFbF" id="2VNOnmIIR1C" role="3cqZAp">
                       <node concept="2OqwBi" id="2VNOnmIIR1D" role="3clFbG">
                         <node concept="37vLTw" id="2VNOnmIIR1E" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2VNOnmIIR1G" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1DF" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="2VNOnmIIR1F" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2VNOnmIIR1G" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1DF" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2VNOnmIIR1H" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1DG" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4077,7 +4077,7 @@
                       <node concept="3clFbF" id="2VNOnmIIR1T" role="3cqZAp">
                         <node concept="2OqwBi" id="2VNOnmIIR1U" role="3clFbG">
                           <node concept="37vLTw" id="2VNOnmIIR1V" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2VNOnmIIR1X" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1DH" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2VNOnmIIR1W" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:5HxjapwgqMb" resolve="getConfigItem" />
@@ -4085,9 +4085,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2VNOnmIIR1X" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1DH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2VNOnmIIR1Y" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1DI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4137,15 +4137,15 @@
                         <node concept="3clFbF" id="2VNOnmIIR2d" role="3cqZAp">
                           <node concept="2OqwBi" id="2VNOnmIIR2e" role="3clFbG">
                             <node concept="37vLTw" id="2VNOnmIIR2f" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2VNOnmIIR2h" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1DJ" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="2VNOnmIIR2g" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2VNOnmIIR2h" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1DJ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2VNOnmIIR2i" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1DK" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4156,15 +4156,15 @@
                       <node concept="3clFbF" id="2VNOnmIIR2m" role="3cqZAp">
                         <node concept="2OqwBi" id="2VNOnmIIR2n" role="3clFbG">
                           <node concept="37vLTw" id="2VNOnmIIR2o" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2VNOnmIIR2q" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1DL" resolve="it" />
                           </node>
                           <node concept="FGMqu" id="2VNOnmIIR2p" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2VNOnmIIR2q" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1DL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2VNOnmIIR2r" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1DM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4460,7 +4460,7 @@
                   <node concept="3clFbF" id="56jrqO8Kjer" role="3cqZAp">
                     <node concept="2OqwBi" id="56jrqO8Kjes" role="3clFbG">
                       <node concept="37vLTw" id="56jrqO8Kjet" role="2Oq$k0">
-                        <ref role="3cqZAo" node="56jrqO8Kjew" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1DN" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="56jrqO8Kjeu" role="2OqNvi">
                         <node concept="chp4Y" id="56jrqO8Kjev" role="cj9EA">
@@ -4470,9 +4470,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="56jrqO8Kjew" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1DN" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="56jrqO8Kjex" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1DO" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd
index f96bce2ff12..e8772a98742 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbddr.core.buildconfig.pluginSolution" uuid="0773211c-025a-47db-9799-a8976f43d599" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbddr.core.buildconfig.pluginSolution" uuid="0773211c-025a-47db-9799-a8976f43d599" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
   </dependencies>
@@ -18,7 +17,7 @@
     <language slang="l:c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1:com.mbeddr.mpsutil.spreferences" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" 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" />
@@ -73,7 +72,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/models/com/mbddr/core/buildconfig/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/models/com/mbddr/core/buildconfig/pluginSolution/plugin.mps
index 5bef7d845f0..b005bacb8a7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/models/com/mbddr/core/buildconfig/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/models/com/mbddr/core/buildconfig/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1" name="com.mbeddr.mpsutil.spreferences" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
@@ -57,7 +57,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -72,6 +72,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -94,7 +95,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -130,7 +131,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -202,7 +202,7 @@
                             <node concept="2OqwBi" id="7$0wAVocWh6" role="3clFbG">
                               <node concept="2OqwBi" id="7$0wAVocWh7" role="2Oq$k0">
                                 <node concept="37vLTw" id="7$0wAVocWh8" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7$0wAVocWhe" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2$Y" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7$0wAVocWh9" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -222,9 +222,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7$0wAVocWhe" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2$Y" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7$0wAVocWhf" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2$Z" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl
index 2ef91ebd6b3..a9b00230df0 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -29,7 +28,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -98,7 +97,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/dataFlow.mps
index 3266f9bcee5..b49888ed7aa 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/dataFlow.mps
@@ -46,7 +46,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -151,7 +151,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -170,7 +170,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -210,7 +210,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/typesystem.mps
index b7534466fe3..b7f2951040d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/languageModels/typesystem.mps
@@ -43,7 +43,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -115,7 +115,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -134,7 +134,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -210,7 +210,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl
index c64c7efde28..fced2a47c7a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
     <dependency reexport="false">a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -47,7 +46,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -110,7 +109,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>1c897ba5-9d43-4035-ac7f-0306495743ac(com.mbeddr.mpsutil.interpreter.test)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps
index 6f8a6a2ec03..4259ac8fe0a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps
@@ -67,7 +67,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -75,7 +75,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -126,7 +126,6 @@
             <node concept="1pGfFk" id="40eYuE1y_aI" role="2ShVmc">
               <ref role="37wK5l" to="2ahs:2pogikRxFvC" resolve="CombinedConditionalInterpreter" />
               <node concept="2OqwBi" id="40eYuE1y_aJ" role="37wK5m">
-                <node concept="3_kTaI" id="40eYuE1y_b3" role="2OqNvi" />
                 <node concept="2OqwBi" id="2PA_oGfdWRO" role="2Oq$k0">
                   <node concept="2YIFZM" id="2PA_oGfdWRP" role="2Oq$k0">
                     <ref role="37wK5l" to="2ahs:2PA_oGdvp1R" resolve="findAllInterpreterExecutablesForCategory" />
@@ -141,6 +140,7 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3_kTaI" id="40eYuE1y_b3" role="2OqNvi" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/editor.mps
index e8a5207f15c..b8d3e27ab49 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/editor.mps
@@ -53,7 +53,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -80,7 +80,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/intentions.mps
index bd07fc504c4..6b1fb09e1ed 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/intentions.mps
@@ -41,7 +41,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -86,7 +86,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/plugin.mps
index 2a2214fcf49..ccd053524ef 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:ce31edff-fe3a-46fd-b60b-2e8d9dc7243f(com.mbeddr.core.cinterpreter.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/structure.mps
index c3f28744464..c090aa1a658 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/structure.mps
@@ -37,7 +37,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 be86402acda..bece3b3f5fc 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
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <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>
@@ -28,7 +27,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -57,7 +56,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps
index 53501aefb42..762875d4226 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -129,7 +129,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -146,7 +146,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -164,6 +164,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -243,7 +244,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -274,7 +275,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -705,15 +705,15 @@
                   <node concept="3clFbF" id="7nkDZJXi2tY" role="3cqZAp">
                     <node concept="2OqwBi" id="7nkDZJXi2xd" role="3clFbG">
                       <node concept="37vLTw" id="7nkDZJXi2tX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7nkDZJXi2r0" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1G5" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="7nkDZJXi31h" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7nkDZJXi2r0" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1G5" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7nkDZJXi2r1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1G6" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -889,14 +889,14 @@
                         <ref role="1Pybhc" node="1tDstbgCbvP" resolve="ReviewHelper" />
                         <ref role="37wK5l" node="5osQY7AdztN" resolve="isReviewable" />
                         <node concept="37vLTw" id="fx1tsHajQK" role="37wK5m">
-                          <ref role="3cqZAo" node="fx1tsHaiAy" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1G7" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="fx1tsHaiAy" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1G7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="fx1tsHaiAz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1G8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2296,15 +2296,15 @@
                   <node concept="3clFbF" id="1tDstbgDm_P" role="3cqZAp">
                     <node concept="2OqwBi" id="1tDstbgDmD1" role="3clFbG">
                       <node concept="37vLTw" id="1tDstbgDm_O" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1tDstbgDmyN" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1G9" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="1tDstbgDn6V" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1tDstbgDmyN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1G9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1tDstbgDmyO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ga" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/constraints.mps
index 452b26f4457..1bca223fe0b 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/constraints.mps
@@ -30,7 +30,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/editor.mps
index 44801c5e2fd..0f6be1f47dc 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/editor.mps
@@ -90,7 +90,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -117,7 +117,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -204,7 +204,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -244,7 +244,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/intentions.mps
index 3ae51423868..8da7a65572f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/intentions.mps
@@ -64,7 +64,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -80,6 +80,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -123,7 +124,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -132,7 +133,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -221,16 +221,16 @@
                       <ref role="37wK5l" to="hhch:1tDstbgCHog" resolve="reevaluateReviewData" />
                       <node concept="2OqwBi" id="6Re_Us$5M1z" role="37wK5m">
                         <node concept="37vLTw" id="6Re_Us$5LY7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="rEiHtt6GuJ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Gb" resolve="it" />
                         </node>
                         <node concept="1mfA1w" id="6Re_Us$5Mj6" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="rEiHtt6GuJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Gb" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="rEiHtt6GuK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Gc" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -556,15 +556,15 @@
                   <node concept="3clFbF" id="5SHUFrIkFuy" role="3cqZAp">
                     <node concept="2OqwBi" id="5SHUFrIkFxP" role="3clFbG">
                       <node concept="37vLTw" id="5SHUFrIkFux" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5SHUFrIkFqH" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Gd" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="5SHUFrIkFMe" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5SHUFrIkFqH" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Gd" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5SHUFrIkFqI" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ge" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/migration.mps
index af34e44c87c..a8136c7c32d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/migration.mps
@@ -12,7 +12,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/plugin.mps
index 83aae3620c5..674839311af 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1" name="com.mbeddr.mpsutil.spreferences" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
@@ -32,7 +32,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/structure.mps
index 49c0f4c7753..12f53119f72 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/structure.mps
@@ -55,7 +55,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd
index a66dcc94036..d6c0e33c32f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.dependencies" uuid="c1e6575b-4e00-419f-9790-93379237d7f7" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.dependencies" uuid="c1e6575b-4e00-419f-9790-93379237d7f7" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -22,13 +21,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
@@ -83,7 +82,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps
index e5ceca9303c..eb8839f2fd8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -27,6 +27,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -48,7 +49,7 @@
       <concept id="1217252042208" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterDeclaration" flags="ng" index="1DS2jV">
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -144,7 +145,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -162,7 +163,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -172,6 +173,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -179,7 +181,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -215,7 +217,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -234,7 +236,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -304,7 +305,7 @@
                       <ref role="37wK5l" to="qd6m:6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkWK" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkWL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkWN" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_0" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkWM" role="2OqNvi">
                           <ref role="3Tt5mk" to="clbe:5jyom5fO9Co" resolve="typeDef" />
@@ -313,9 +314,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkWN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2_0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkWO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2_1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -355,7 +356,7 @@
                       <ref role="37wK5l" to="qd6m:6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkYo" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkYp" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkYr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_2" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkYq" role="2OqNvi">
                           <ref role="3Tt5mk" to="clbe:5yYXyc4Z0CT" resolve="struct" />
@@ -364,9 +365,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkYr" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2_2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkYs" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2_3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -406,7 +407,7 @@
                       <ref role="37wK5l" to="qd6m:6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkYJ" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkYK" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkYM" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_4" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkYL" role="2OqNvi">
                           <ref role="3Tt5mk" to="clbe:56ytRgsLog7" resolve="union" />
@@ -415,9 +416,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkYM" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2_4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkYN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2_5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -457,7 +458,7 @@
                       <ref role="37wK5l" to="qd6m:6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkZ6" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkZ7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkZ9" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_6" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkZ8" role="2OqNvi">
                           <ref role="3Tt5mk" to="clbe:7D99css6O16" resolve="enum" />
@@ -466,9 +467,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkZ9" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2_6" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkZa" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2_7" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1214,6 +1215,7 @@
   <node concept="sE7Ow" id="6o2p2Z1vK9r">
     <property role="TrG5h" value="ShowDependencies" />
     <property role="2uzpH1" value="Show Dependencies" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="5BkFC2yhAHn" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl
index e5b7ae67766..ac6080e5b82 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl
@@ -46,7 +46,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -140,7 +140,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -152,7 +151,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -173,7 +172,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps
index 4beb1215232..71ead938858 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:07662ee6-795f-4e31-90c2-e6b02f94bc78(com.mbeddr.core.embedded.generator.template.main@generator)">
   <persistence version="9" />
-  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="5" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="2" />
@@ -175,6 +174,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -381,7 +381,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -1957,7 +1956,7 @@
                       <node concept="3clFbF" id="6oWQ7E1mlZq" role="3cqZAp">
                         <node concept="2OqwBi" id="6oWQ7E1mlZr" role="3clFbG">
                           <node concept="37vLTw" id="6oWQ7E1mlZs" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6oWQ7E1mlZw" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Gf" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="6oWQ7E1mlZt" role="2OqNvi">
                             <node concept="1xMEDy" id="6oWQ7E1mlZu" role="1xVPHs">
@@ -1969,9 +1968,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6oWQ7E1mlZw" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Gf" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6oWQ7E1mlZx" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Gg" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2054,7 +2053,7 @@
                                 <node concept="3clFbF" id="6oWQ7E1sQDC" role="3cqZAp">
                                   <node concept="2OqwBi" id="6oWQ7E1sQYZ" role="3clFbG">
                                     <node concept="37vLTw" id="6oWQ7E1sQDB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6oWQ7E1sPv0" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Gh" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="6oWQ7E1sTbe" role="2OqNvi">
                                       <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -2062,9 +2061,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6oWQ7E1sPv0" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Gh" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="6oWQ7E1sPv1" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Gi" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/behavior.mps
index f3c8a6918e8..1f99ead6ec8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/behavior.mps
@@ -593,9 +593,6 @@
       <node concept="3clFbS" id="5W7baq$60ms" role="3clF47">
         <node concept="3clFbF" id="50jlhG3wcxx" role="3cqZAp">
           <node concept="2OqwBi" id="y826GHuaPH" role="3clFbG">
-            <node concept="2qgKlT" id="y826GHuaPM" role="2OqNvi">
-              <ref role="37wK5l" node="5W7baq$5NAe" resolve="register" />
-            </node>
             <node concept="1PxgMI" id="4oC$u2d2kSg" role="2Oq$k0">
               <property role="1BlNFB" value="true" />
               <node concept="chp4Y" id="4oC$u2d2kXo" role="3oSUPX">
@@ -608,6 +605,9 @@
                 </node>
               </node>
             </node>
+            <node concept="2qgKlT" id="y826GHuaPM" role="2OqNvi">
+              <ref role="37wK5l" node="5W7baq$5NAe" resolve="register" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/constraints.mps
index 8a6f33850f7..f518f7353dc 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/constraints.mps
@@ -63,7 +63,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -150,7 +150,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/editor.mps
index 0188fb945aa..3be85659421 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:1200d76b-83c0-4a1a-bd4e-b2766a3a8515(com.mbeddr.core.embedded.editor)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -78,10 +78,10 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -103,7 +103,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -126,7 +126,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -134,7 +134,7 @@
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -147,7 +147,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="6918029743850363447" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_targetNode" flags="ng" index="1NM5Ph" />
@@ -227,7 +227,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -285,7 +285,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/intentions.mps
index 2cdac1680ed..0f6e1d35893 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/intentions.mps
@@ -107,7 +107,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/migration.mps
index 120b9eaea88..472ecdd6eb1 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -67,7 +67,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -76,7 +76,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -120,7 +120,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/typesystem.mps
index 0771eadffa2..5bbda774261 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/typesystem.mps
@@ -85,7 +85,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -214,7 +214,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl
index 21abe93061e..2828a1f6dd5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl
@@ -35,7 +35,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <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" />
@@ -87,7 +87,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -121,7 +120,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -146,7 +145,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps
index 14990445381..2940f04ed35 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps
@@ -28,7 +28,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -64,7 +64,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/actions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/actions.mps
index bfdba9bb079..45ef8df59c4 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/actions.mps
@@ -14,6 +14,7 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -108,7 +109,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -129,7 +130,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -238,7 +239,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -2427,8 +2428,8 @@
           <node concept="3fqX7Q" id="1wu5Hv5M9OC" role="3clFbw">
             <node concept="2OqwBi" id="6g_o1CJG6UQ" role="3fr31v">
               <node concept="2YIFZM" id="6g_o1CJG53k" role="2Oq$k0">
-                <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
-                <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+                <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                 <node concept="2OqwBi" id="6g_o1CJG6b6" role="37wK5m">
                   <node concept="2OqwBi" id="6g_o1CJG607" role="2Oq$k0">
                     <node concept="2OqwBi" id="6g_o1CJG5Ek" role="2Oq$k0">
@@ -2476,8 +2477,8 @@
           <node concept="3fqX7Q" id="1wu5Hv5Macs" role="3clFbw">
             <node concept="2OqwBi" id="6g_o1CJGaoI" role="3fr31v">
               <node concept="2YIFZM" id="6g_o1CJG86A" role="2Oq$k0">
-                <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeParent(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeParent" />
-                <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeParent(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeParent" />
+                <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                 <node concept="2OqwBi" id="6g_o1CJG9wf" role="37wK5m">
                   <node concept="2OqwBi" id="6g_o1CJG9dA" role="2Oq$k0">
                     <node concept="2OqwBi" id="6g_o1CJG8Xu" role="2Oq$k0">
@@ -2581,8 +2582,8 @@
               <node concept="3fqX7Q" id="1wu5Hv5Pn$M" role="3clFbw">
                 <node concept="2OqwBi" id="6g_o1CJGhhS" role="3fr31v">
                   <node concept="2YIFZM" id="6g_o1CJGbOx" role="2Oq$k0">
-                    <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeAncestor(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeAncestorContext)" resolve="checkCanBeAncestor" />
-                    <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                    <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeAncestor(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeAncestorContext)" resolve="checkCanBeAncestor" />
+                    <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                     <node concept="2OqwBi" id="6g_o1CJGfE_" role="37wK5m">
                       <node concept="2OqwBi" id="1uvPAqC_b66" role="2Oq$k0">
                         <node concept="37vLTw" id="1uvPAqC_8Zf" role="2Oq$k0">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps
index dc4b9824b28..caf93940128 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps
@@ -287,6 +287,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -488,7 +489,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1525,7 +1525,7 @@
                     <node concept="3clFbF" id="2JIP8c_ZWCV" role="3cqZAp">
                       <node concept="2OqwBi" id="2JIP8c_ZWDh" role="3clFbG">
                         <node concept="37vLTw" id="2JIP8c_ZWCW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2JIP8c_ZWCT" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Gj" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2JIP8c_ZWDm" role="2OqNvi">
                           <ref role="37wK5l" node="1VQvajLb13M" resolve="renderReadable" />
@@ -1533,9 +1533,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2JIP8c_ZWCT" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Gj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2JIP8c_ZWCU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Gk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2624,7 +2624,7 @@
                             <node concept="2OqwBi" id="2cCHKvAT0fp" role="3clFbG">
                               <node concept="2OqwBi" id="2cCHKvAT0fq" role="2Oq$k0">
                                 <node concept="37vLTw" id="2cCHKvAT0fr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2cCHKvAT0fv" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Gl" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="2cCHKvAT0fs" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpce:3Ftr4R6BH8$" resolve="metaClass" />
@@ -2638,9 +2638,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2cCHKvAT0fv" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Gl" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2cCHKvAT0fw" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Gm" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3104,7 +3104,7 @@
                     <node concept="3clFbF" id="4zXqh6VIfZT" role="3cqZAp">
                       <node concept="2OqwBi" id="4zXqh6VIglD" role="3clFbG">
                         <node concept="37vLTw" id="4zXqh6VIfZS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4zXqh6VIfSF" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Gn" resolve="it" />
                         </node>
                         <node concept="liA8E" id="4zXqh6VIgD0" role="2OqNvi">
                           <ref role="37wK5l" to="rcia:4zXqh6VBfsX" resolve="isApplicable" />
@@ -3115,9 +3115,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4zXqh6VIfSF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Gn" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4zXqh6VIfSG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Go" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4087,7 +4087,7 @@
                         <node concept="2yIwOk" id="2Wc_BLynobH" role="2OqNvi" />
                         <node concept="2OqwBi" id="2Wc_BLynobI" role="2Oq$k0">
                           <node concept="37vLTw" id="2Wc_BLynobJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2Wc_BLynobO" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Gp" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2Wc_BLynobK" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:6w9JOkHS6za" resolve="basicType" />
@@ -4103,9 +4103,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2Wc_BLynobO" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Gp" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2Wc_BLynobP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Gq" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10770,7 +10770,7 @@
                       <node concept="3clFbF" id="3b1kLoLO7Ab" role="3cqZAp">
                         <node concept="2OqwBi" id="3b1kLoLO7Ac" role="3clFbG">
                           <node concept="37vLTw" id="3b1kLoLO7Ad" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3b1kLoLO7Ag" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Gr" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="3b1kLoLO7Ae" role="2OqNvi">
                             <node concept="chp4Y" id="3b1kLoLO7Af" role="cj9EA">
@@ -10780,9 +10780,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3b1kLoLO7Ag" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Gr" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3b1kLoLO7Ah" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Gs" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10799,7 +10799,7 @@
                         <node concept="1PxgMI" id="3b1kLoLO7Ao" role="33vP2m">
                           <node concept="2OqwBi" id="3b1kLoLO7Ap" role="1m5AlR">
                             <node concept="37vLTw" id="3b1kLoLO7Aq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3b1kLoLO7AE" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Gt" resolve="it" />
                             </node>
                             <node concept="1$rogu" id="3b1kLoLO7Ar" role="2OqNvi" />
                           </node>
@@ -10845,9 +10845,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3b1kLoLO7AE" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Gt" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3b1kLoLO7AF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Gu" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -14121,7 +14121,7 @@
                           <node concept="3clFbF" id="__7kBUayVz" role="3cqZAp">
                             <node concept="2OqwBi" id="__7kBUayVT" role="3clFbG">
                               <node concept="37vLTw" id="__7kBUayV$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="__7kBUayVx" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Gv" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="__7kBUayVZ" role="2OqNvi">
                                 <node concept="chp4Y" id="__7kBUayW1" role="cj9EA">
@@ -14131,9 +14131,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="__7kBUayVx" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Gv" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="__7kBUayVy" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Gw" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -20636,7 +20636,7 @@
                         <node concept="3clFbF" id="7x2kTsymGU2" role="3cqZAp">
                           <node concept="2OqwBi" id="7x2kTsymGU3" role="3clFbG">
                             <node concept="37vLTw" id="7x2kTsymGU4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7x2kTsymGU6" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Gx" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="7x2kTsymGU5" role="2OqNvi">
                               <ref role="3TtcxE" to="tpce:f_TKVDF" resolve="linkDeclaration" />
@@ -20644,9 +20644,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7x2kTsymGU6" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Gx" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7x2kTsymGU7" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Gy" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -20671,7 +20671,7 @@
                         </node>
                         <node concept="2OqwBi" id="7x2kTsyCTKw" role="3uHU7B">
                           <node concept="37vLTw" id="7x2kTsyCTD6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7x2kTsyCTvC" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Gz" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7x2kTsyCVKB" role="2OqNvi">
                             <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
@@ -20680,9 +20680,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7x2kTsyCTvC" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Gz" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7x2kTsyCTvD" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1G$" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -21866,13 +21866,13 @@
                             <ref role="37wK5l" to="2ahs:5EXX68XgLtd" resolve="set" />
                             <node concept="2OqwBi" id="7xtsKqWm7U5" role="37wK5m">
                               <node concept="37vLTw" id="7xtsKqWm7U6" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7xtsKqWm7Ub" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1G_" resolve="it" />
                               </node>
                               <node concept="3AY5_j" id="7xtsKqWm7U7" role="2OqNvi" />
                             </node>
                             <node concept="2OqwBi" id="7xtsKqWm7U8" role="37wK5m">
                               <node concept="37vLTw" id="7xtsKqWm7U9" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7xtsKqWm7Ub" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1G_" resolve="it" />
                               </node>
                               <node concept="3AV6Ez" id="7xtsKqWm7Ua" role="2OqNvi" />
                             </node>
@@ -21880,9 +21880,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7xtsKqWm7Ub" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1G_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7xtsKqWm7Uc" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1GA" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -22097,7 +22097,7 @@
                                       <node concept="3cpWs3" id="sufbFKILUt" role="37wK5m">
                                         <node concept="2OqwBi" id="sufbFKIMdY" role="3uHU7w">
                                           <node concept="37vLTw" id="sufbFKILVr" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7FtvAFycavM" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1GB" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="sufbFKIWOp" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -22118,7 +22118,7 @@
                                       <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
                                       <ref role="37wK5l" to="2ahs:4jkUBhBVOKX" resolve="getInterpreterExecutable" />
                                       <node concept="37vLTw" id="7FtvAFycdiJ" role="37wK5m">
-                                        <ref role="3cqZAo" node="7FtvAFycavM" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1GB" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3uibUv" id="2BvMmL2Are" role="10QFUM">
@@ -22128,9 +22128,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7FtvAFycavM" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1GB" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7FtvAFycavN" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1GC" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -23167,7 +23167,7 @@
                     <node concept="3clFbF" id="4zXqh6WD4D0" role="3cqZAp">
                       <node concept="2OqwBi" id="4zXqh6WD4D1" role="3clFbG">
                         <node concept="37vLTw" id="4zXqh6WD4D2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4zXqh6WD4D5" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1GD" resolve="it" />
                         </node>
                         <node concept="liA8E" id="4zXqh6WD4D3" role="2OqNvi">
                           <ref role="37wK5l" to="rcia:4zXqh6VIhj5" resolve="isApplicable" />
@@ -23178,9 +23178,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4zXqh6WD4D5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1GD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4zXqh6WD4D6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1GE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -23544,7 +23544,7 @@
                     <node concept="3clFbF" id="1h$nB_AZ8UV" role="3cqZAp">
                       <node concept="2OqwBi" id="1h$nB_AZ8UW" role="3clFbG">
                         <node concept="37vLTw" id="1h$nB_AZ8UX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1h$nB_AZ8V0" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1GF" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1h$nB_AZ8UY" role="2OqNvi">
                           <ref role="37wK5l" to="rcia:4zXqh6VBfsX" resolve="isApplicable" />
@@ -23555,9 +23555,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1h$nB_AZ8V0" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1GF" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1h$nB_AZ8V1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1GG" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/constraints.mps
index 86e145dee58..cc5f51b213c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/constraints.mps
@@ -79,7 +79,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -155,7 +155,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -193,7 +193,7 @@
         <property id="1174558315290" name="start" index="1T8p8b" />
         <property id="1174558317822" name="end" index="1T8pRJ" />
       </concept>
-      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ngI" index="1YMW5F">
         <child id="1174653387388" name="regexp" index="1YN4dH" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps
index 1bd596bdd48..6696ab1f09b 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps
@@ -46,7 +46,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -119,7 +119,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps
index f61922efa7b..0d98936fe4e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps
@@ -117,10 +117,10 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -148,7 +148,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -184,12 +184,12 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -205,7 +205,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="3647146066980922272" name="jetbrains.mps.lang.editor.structure.SelectInEditorOperation" flags="nn" index="1OKiuA">
@@ -337,7 +337,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -358,7 +358,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -466,7 +466,7 @@
       <concept id="4384308856523540092" name="de.slisson.mps.tables.structure.VerticalAlignmentStyleItem" flags="lg" index="QtRvh">
         <property id="4384308856523581138" name="alignment" index="QtXtZ" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG">
@@ -555,7 +555,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/intentions.mps
index 9569ae67fc3..f5918973fe8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/intentions.mps
@@ -103,7 +103,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -120,6 +120,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -256,7 +257,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -281,7 +282,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1352,15 +1352,15 @@
                       <node concept="3clFbF" id="2jhjVaym_7M" role="3cqZAp">
                         <node concept="2OqwBi" id="2jhjVaym__3" role="3clFbG">
                           <node concept="37vLTw" id="2jhjVaym_7L" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2jhjVaymz_h" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1GH" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="2jhjVaymCcL" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2jhjVaymz_h" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1GH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2jhjVaymz_i" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1GI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps
index 11a7bb5ded6..7cd482270cd 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="-1" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -81,7 +81,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -94,7 +94,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -110,6 +110,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -188,7 +189,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -220,7 +221,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -517,7 +517,7 @@
                               <node concept="2OqwBi" id="yjDrJEn9Zr" role="3fr31v">
                                 <node concept="2OqwBi" id="yjDrJEn9Zs" role="2Oq$k0">
                                   <node concept="37vLTw" id="yjDrJEn9Zt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="yjDrJEn9ZG" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hh" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="yjDrJEn9Zu" role="2OqNvi">
                                     <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -538,7 +538,7 @@
                                 <node concept="2OqwBi" id="yjDrJEn9Z$" role="2Oq$k0">
                                   <node concept="2OqwBi" id="yjDrJEn9Z_" role="2Oq$k0">
                                     <node concept="37vLTw" id="yjDrJEn9ZA" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="yjDrJEn9ZG" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Hh" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="yjDrJEn9ZB" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -558,9 +558,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="yjDrJEn9ZG" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Hh" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="yjDrJEn9ZH" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Hi" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/plugin.mps
index 854bd084b9d..d8b13cc28ca 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:bae7addc-e10d-4f29-a8ac-0448d3c5daaf(com.mbeddr.core.expressions.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/scripts.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/scripts.mps
index 113142156c2..560167d9ce6 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/scripts.mps
@@ -30,7 +30,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -64,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps
index 8bd05f50f81..c379e039ab2 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps
@@ -90,7 +90,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -170,7 +170,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps
index 4f74aff4784..72a524f300e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps
@@ -48,7 +48,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -151,7 +151,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -175,7 +175,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -202,6 +202,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -461,7 +462,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -503,7 +504,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -1613,7 +1613,7 @@
                         <node concept="3clFbF" id="67O0HaCtwp6" role="3cqZAp">
                           <node concept="2OqwBi" id="67O0HaCtwps" role="3clFbG">
                             <node concept="37vLTw" id="67O0HaCtwp7" role="2Oq$k0">
-                              <ref role="3cqZAo" node="67O0HaCtwp4" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1GJ" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="67O0HaCtwpy" role="2OqNvi">
                               <node concept="chp4Y" id="67O0HaCtwp$" role="cj9EA">
@@ -1623,9 +1623,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="67O0HaCtwp4" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1GJ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="67O0HaCtwp5" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1GK" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1672,7 +1672,7 @@
                             <node concept="3clFbF" id="67O0HaCtwql" role="3cqZAp">
                               <node concept="2OqwBi" id="67O0HaCtwqm" role="3clFbG">
                                 <node concept="37vLTw" id="67O0HaCtwqn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="67O0HaCtwqq" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1GL" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="67O0HaCtwqo" role="2OqNvi">
                                   <node concept="chp4Y" id="67O0HaCtwqp" role="cj9EA">
@@ -1682,9 +1682,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="67O0HaCtwqq" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1GL" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="67O0HaCtwqr" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1GM" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1741,7 +1741,7 @@
                             <node concept="3clFbF" id="67O0HaCtwqX" role="3cqZAp">
                               <node concept="2OqwBi" id="67O0HaCtwqY" role="3clFbG">
                                 <node concept="37vLTw" id="67O0HaCtwqZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="67O0HaCtwr2" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1GN" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="67O0HaCtwr0" role="2OqNvi">
                                   <node concept="chp4Y" id="67O0HaCtwr1" role="cj9EA">
@@ -1751,9 +1751,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="67O0HaCtwr2" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1GN" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="67O0HaCtwr3" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1GO" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1791,7 +1791,7 @@
                         <node concept="3clFbF" id="67O0HaCtwrn" role="3cqZAp">
                           <node concept="2OqwBi" id="67O0HaCtwro" role="3clFbG">
                             <node concept="37vLTw" id="67O0HaCtwrp" role="2Oq$k0">
-                              <ref role="3cqZAo" node="67O0HaCtwrs" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1GP" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="67O0HaCtwrq" role="2OqNvi">
                               <node concept="chp4Y" id="67O0HaCtwrr" role="cj9EA">
@@ -1801,9 +1801,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="67O0HaCtwrs" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1GP" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="67O0HaCtwrt" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1GQ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2385,7 +2385,7 @@
                         <node concept="3clFbF" id="7mgWOZ6RSli" role="3cqZAp">
                           <node concept="2OqwBi" id="7mgWOZ6RSlj" role="3clFbG">
                             <node concept="37vLTw" id="7mgWOZ6RSlk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7mgWOZ6RSln" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1GR" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="7mgWOZ6RSll" role="2OqNvi">
                               <node concept="chp4Y" id="7mgWOZ6RSlm" role="cj9EA">
@@ -2395,9 +2395,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7mgWOZ6RSln" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1GR" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7mgWOZ6RSlo" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1GS" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2444,7 +2444,7 @@
                             <node concept="3clFbF" id="7mgWOZ6RSlI" role="3cqZAp">
                               <node concept="2OqwBi" id="7mgWOZ6RSlJ" role="3clFbG">
                                 <node concept="37vLTw" id="7mgWOZ6RSlK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7mgWOZ6RSlN" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1GT" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="7mgWOZ6RSlL" role="2OqNvi">
                                   <node concept="chp4Y" id="7mgWOZ6RSlM" role="cj9EA">
@@ -2454,9 +2454,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7mgWOZ6RSlN" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1GT" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7mgWOZ6RSlO" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1GU" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2513,7 +2513,7 @@
                             <node concept="3clFbF" id="7mgWOZ6RSme" role="3cqZAp">
                               <node concept="2OqwBi" id="7mgWOZ6RSmf" role="3clFbG">
                                 <node concept="37vLTw" id="7mgWOZ6RSmg" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7mgWOZ6RSmj" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1GV" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="7mgWOZ6RSmh" role="2OqNvi">
                                   <node concept="chp4Y" id="7mgWOZ6RSmi" role="cj9EA">
@@ -2523,9 +2523,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7mgWOZ6RSmj" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1GV" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7mgWOZ6RSmk" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1GW" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2563,7 +2563,7 @@
                         <node concept="3clFbF" id="7mgWOZ6RSm$" role="3cqZAp">
                           <node concept="2OqwBi" id="7mgWOZ6RSm_" role="3clFbG">
                             <node concept="37vLTw" id="7mgWOZ6RSmA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7mgWOZ6RSmD" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1GX" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="7mgWOZ6RSmB" role="2OqNvi">
                               <node concept="chp4Y" id="7mgWOZ6RSmC" role="cj9EA">
@@ -2573,9 +2573,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7mgWOZ6RSmD" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1GX" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7mgWOZ6RSmE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1GY" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4962,7 +4962,7 @@
                                   <node concept="3clFbF" id="4OlFaNL4V79" role="3cqZAp">
                                     <node concept="2OqwBi" id="4OlFaNL4V7a" role="3clFbG">
                                       <node concept="37vLTw" id="4OlFaNL4V7b" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4OlFaNL4V7e" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1GZ" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="4OlFaNL4V7c" role="2OqNvi">
                                         <node concept="chp4Y" id="4OlFaNL4V7d" role="cj9EA">
@@ -4972,9 +4972,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4OlFaNL4V7e" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1GZ" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4OlFaNL4V7f" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1H0" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -5045,7 +5045,7 @@
                                     <node concept="3clFbF" id="4OlFaNL4V6E" role="3cqZAp">
                                       <node concept="2OqwBi" id="4OlFaNL4V6F" role="3clFbG">
                                         <node concept="37vLTw" id="4OlFaNL4V6G" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4OlFaNL4V6J" resolve="rt" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1H1" resolve="rt" />
                                         </node>
                                         <node concept="1mIQ4w" id="4OlFaNL4V6H" role="2OqNvi">
                                           <node concept="chp4Y" id="4OlFaNL4V6I" role="cj9EA">
@@ -5055,9 +5055,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4OlFaNL4V6J" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1H1" role="1bW2Oz">
                                     <property role="TrG5h" value="rt" />
-                                    <node concept="2jxLKc" id="4OlFaNL4V6K" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1H2" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -5102,7 +5102,7 @@
                                   <node concept="3clFbF" id="4OlFaNL4V7y" role="3cqZAp">
                                     <node concept="2OqwBi" id="4OlFaNL4V7z" role="3clFbG">
                                       <node concept="37vLTw" id="4OlFaNL4V7$" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4OlFaNL4V7B" resolve="rt" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1H3" resolve="rt" />
                                       </node>
                                       <node concept="1mIQ4w" id="4OlFaNL4V7_" role="2OqNvi">
                                         <node concept="chp4Y" id="4OlFaNL4V7A" role="cj9EA">
@@ -5112,9 +5112,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4OlFaNL4V7B" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1H3" role="1bW2Oz">
                                   <property role="TrG5h" value="rt" />
-                                  <node concept="2jxLKc" id="4OlFaNL4V7C" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1H4" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -7503,7 +7503,7 @@
                       <node concept="3clFbF" id="7YIk2VQKllS" role="3cqZAp">
                         <node concept="2OqwBi" id="7YIk2VQKlme" role="3clFbG">
                           <node concept="37vLTw" id="7YIk2VQKllT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7YIk2VQKllQ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1H5" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="7YIk2VQKlmk" role="2OqNvi">
                             <node concept="25Kdxt" id="7YIk2VQKlmm" role="cj9EA">
@@ -7515,9 +7515,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7YIk2VQKllQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1H5" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7YIk2VQKllR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1H6" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7627,7 +7627,7 @@
                       <node concept="3clFbF" id="4yCyDr3i_DR" role="3cqZAp">
                         <node concept="2OqwBi" id="4yCyDr3i_DS" role="3clFbG">
                           <node concept="37vLTw" id="4yCyDr3i_DT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4yCyDr3i_DX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1H7" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4yCyDr3i_DU" role="2OqNvi">
                             <node concept="25Kdxt" id="4yCyDr3i_DV" role="cj9EA">
@@ -7639,9 +7639,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4yCyDr3i_DX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1H7" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4yCyDr3i_DY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1H8" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8335,7 +8335,7 @@
                             <node concept="1Wc70l" id="2N9rhKQoPvu" role="3clFbG">
                               <node concept="2OqwBi" id="2N9rhKQoPFa" role="3uHU7B">
                                 <node concept="37vLTw" id="2N9rhKQtFAX" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2I5SFMdyItH" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1H9" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="2N9rhKQoQb6" role="2OqNvi">
                                   <node concept="chp4Y" id="2N9rhKQoQjA" role="cj9EA">
@@ -8345,7 +8345,7 @@
                               </node>
                               <node concept="2OqwBi" id="2I5SFMdyIu5" role="3uHU7w">
                                 <node concept="37vLTw" id="2I5SFMdyItK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2I5SFMdyItH" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1H9" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="2I5SFMdyIub" role="2OqNvi">
                                   <node concept="chp4Y" id="2I5SFMdyIud" role="cj9EA">
@@ -8356,9 +8356,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2I5SFMdyItH" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1H9" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2I5SFMdyItI" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Ha" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -8387,7 +8387,7 @@
                               <node concept="3clFbF" id="2N9rhKQoQIk" role="3cqZAp">
                                 <node concept="2OqwBi" id="2N9rhKQoQIq" role="3clFbG">
                                   <node concept="37vLTw" id="2N9rhKQoQIr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2N9rhKQoQIu" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hb" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="2N9rhKQoQIs" role="2OqNvi">
                                     <node concept="chp4Y" id="2N9rhKQoQIt" role="cj9EA">
@@ -8397,9 +8397,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2N9rhKQoQIu" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Hb" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2N9rhKQoQIv" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Hc" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -8668,7 +8668,7 @@
                           <node concept="3clFbF" id="6YDrr9LwAu5" role="3cqZAp">
                             <node concept="2OqwBi" id="6YDrr9LwAu6" role="3clFbG">
                               <node concept="37vLTw" id="6YDrr9LwAu7" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6YDrr9LwAua" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Hd" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6YDrr9LwAu8" role="2OqNvi">
                                 <node concept="chp4Y" id="6YDrr9LwAuH" role="cj9EA">
@@ -8678,9 +8678,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6YDrr9LwAua" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Hd" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6YDrr9LwAub" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1He" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -13018,7 +13018,7 @@
                           <node concept="3clFbF" id="1p0tc83DsT1" role="3cqZAp">
                             <node concept="2OqwBi" id="1p0tc83DsT2" role="3clFbG">
                               <node concept="37vLTw" id="1p0tc83DsT3" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1p0tc83DsT6" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Hf" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="1p0tc83DsT4" role="2OqNvi">
                                 <node concept="chp4Y" id="1p0tc83DsT5" role="cj9EA">
@@ -13028,9 +13028,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1p0tc83DsT6" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Hf" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1p0tc83DsT7" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Hg" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd
index 4b273643b61..03df9dbfc6f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddt.core.expressions.pluginSolution" uuid="cb5fd060-a6fb-423f-827a-02ea829501c8" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddt.core.expressions.pluginSolution" uuid="cb5fd060-a6fb-423f-827a-02ea829501c8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
   </dependencies>
@@ -18,7 +17,7 @@
     <language slang="l:c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1:com.mbeddr.mpsutil.spreferences" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/models/com/mbeddt/core/expressions/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/models/com/mbeddt/core/expressions/pluginSolution/plugin.mps
index e5791d37ad5..14aa118b06c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/models/com/mbeddt/core/expressions/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/models/com/mbeddt/core/expressions/pluginSolution/plugin.mps
@@ -29,7 +29,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -41,7 +41,7 @@
       <concept id="4040588429969069898" name="jetbrains.mps.lang.smodel.structure.LanguageReferenceExpression" flags="nn" index="3rNLEe" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/behavior.mps
index f9aa116c3e3..d9dae86cef4 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/behavior.mps
@@ -57,7 +57,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -67,7 +67,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -79,7 +79,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/constraints.mps
index 25bca37a9f2..58e21868778 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/constraints.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/editor.mps
index 199f02ac80c..b85da1c7ae5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/editor.mps
@@ -45,7 +45,7 @@
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -59,7 +59,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -69,7 +69,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/plugin.mps
index 74ad0dc30a6..03447e8ed77 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:9ec3f27f-f216-40a1-b1e7-8245371d00db(com.mbeddr.core.legacy.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/refactorings.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/refactorings.mps
index 50ebea3ef47..cc677003a98 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/refactorings.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/refactorings.mps
@@ -74,7 +74,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -86,13 +86,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -168,7 +169,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -194,7 +195,6 @@
         <child id="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -337,7 +337,7 @@
                           <node concept="2OqwBi" id="5Hxjapwgucr" role="3uHU7B">
                             <node concept="3n3YKJ" id="3uuB$tyGpdJ" role="2OqNvi" />
                             <node concept="37vLTw" id="5Hxjapwguct" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6YcpEFdwctZ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Hj" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -345,7 +345,7 @@
                           <node concept="2OqwBi" id="5Hxjapwgt_K" role="2Oq$k0">
                             <node concept="3n3YKJ" id="3uuB$tyGpGt" role="2OqNvi" />
                             <node concept="37vLTw" id="5Hxjapwgt_M" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6YcpEFdwctZ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Hj" resolve="it" />
                             </node>
                           </node>
                           <node concept="liA8E" id="6YcpEFdwctX" role="2OqNvi">
@@ -358,9 +358,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6YcpEFdwctZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Hj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6YcpEFdwcu0" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Hk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/structure.mps
index a9a520eac39..350a179c510 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/languageModels/structure.mps
@@ -43,7 +43,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl
index b1dd0b5be43..0d9e6e811a8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -39,7 +38,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -99,7 +98,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/models/com/mbeddr/core/legacy/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/models/com/mbeddr/core/legacy/pluginSolution/plugin.mps
index 015abb7bd95..45eecca9f15 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/models/com/mbeddr/core/legacy/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/models/com/mbeddr/core/legacy/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
   </languages>
   <imports>
@@ -20,7 +20,7 @@
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd
index abd6b9f4bf0..94a19cd898e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.legacy.pluginSolution" uuid="a1da80d2-ce15-42c0-8547-cae6b76b888f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.legacy.pluginSolution" uuid="a1da80d2-ce15-42c0-8547-cae6b76b888f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ad5e9db1-9600-47c7-86ef-614165b281b8(com.mbeddr.core.legacy)</dependency>
   </dependencies>
@@ -20,7 +19,7 @@
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/generator/template/main@generator.mps
index 6adf779efc9..80c349f966c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/generator/template/main@generator.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" name="com.mbeddr.core.make" version="9" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -113,7 +113,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/behavior.mps
index b01ff7db645..6886ce92ab6 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/behavior.mps
@@ -39,7 +39,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -97,7 +97,7 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -105,7 +105,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -114,6 +114,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -171,7 +172,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -190,7 +191,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
@@ -440,7 +440,7 @@
                     <node concept="1_3QMa" id="7EZ1SpoQZwR" role="3cqZAp">
                       <node concept="2OqwBi" id="7EZ1SpoQZwS" role="1_3QMn">
                         <node concept="37vLTw" id="7EZ1SpoQZwT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7EZ1SpoQZxt" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Hl" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="7EZ1SpoQZwU" role="2OqNvi" />
                       </node>
@@ -457,7 +457,7 @@
                                     <ref role="cht4Q" to="i2y7:bzEfeAYe93" resolve="ModuleRef" />
                                   </node>
                                   <node concept="37vLTw" id="7EZ1SpoQZx3" role="1m5AlR">
-                                    <ref role="3cqZAo" node="7EZ1SpoQZxt" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hl" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="7EZ1SpoQZx4" role="2OqNvi">
@@ -483,7 +483,7 @@
                                   <ref role="cht4Q" to="i2y7:2Vizpn2Mx$z" resolve="PlainTextFragment" />
                                 </node>
                                 <node concept="37vLTw" id="7EZ1SpoQZxd" role="1m5AlR">
-                                  <ref role="3cqZAo" node="7EZ1SpoQZxt" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Hl" resolve="it" />
                                 </node>
                               </node>
                               <node concept="3TrcHB" id="7EZ1SpoQZxe" role="2OqNvi">
@@ -506,7 +506,7 @@
                                     <ref role="cht4Q" to="i2y7:7EZ1Spm4JaP" resolve="RuleRef" />
                                   </node>
                                   <node concept="37vLTw" id="5st30ygCj3j" role="1m5AlR">
-                                    <ref role="3cqZAo" node="7EZ1SpoQZxt" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hl" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="5st30ygCkrR" role="2OqNvi">
@@ -533,7 +533,7 @@
                                     <ref role="cht4Q" to="i2y7:2Vizpn2Mx$T" resolve="VariableRef" />
                                   </node>
                                   <node concept="37vLTw" id="7EZ1SpoQZxn" role="1m5AlR">
-                                    <ref role="3cqZAo" node="7EZ1SpoQZxt" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hl" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="7EZ1SpoQZxo" role="2OqNvi">
@@ -560,9 +560,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7EZ1SpoQZxt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Hl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7EZ1SpoQZxu" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Hm" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -663,7 +663,7 @@
                     <node concept="1_3QMa" id="5st30ygCVmF" role="3cqZAp">
                       <node concept="2OqwBi" id="5st30ygCVmG" role="1_3QMn">
                         <node concept="37vLTw" id="5st30ygCVmH" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5st30ygCVnv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Hn" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="5st30ygCVmI" role="2OqNvi" />
                       </node>
@@ -680,7 +680,7 @@
                                     <ref role="cht4Q" to="i2y7:bzEfeAYe93" resolve="ModuleRef" />
                                   </node>
                                   <node concept="37vLTw" id="5st30ygCVmR" role="1m5AlR">
-                                    <ref role="3cqZAo" node="5st30ygCVnv" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hn" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="5st30ygCVmS" role="2OqNvi">
@@ -706,7 +706,7 @@
                                   <ref role="cht4Q" to="i2y7:2Vizpn2Mx$z" resolve="PlainTextFragment" />
                                 </node>
                                 <node concept="37vLTw" id="5st30ygCVn1" role="1m5AlR">
-                                  <ref role="3cqZAo" node="5st30ygCVnv" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Hn" resolve="it" />
                                 </node>
                               </node>
                               <node concept="3TrcHB" id="5st30ygCVn2" role="2OqNvi">
@@ -729,7 +729,7 @@
                                     <ref role="cht4Q" to="i2y7:7EZ1Spm4JaP" resolve="RuleRef" />
                                   </node>
                                   <node concept="37vLTw" id="5st30ygCVnp" role="1m5AlR">
-                                    <ref role="3cqZAo" node="5st30ygCVnv" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hn" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="5st30ygCVnq" role="2OqNvi">
@@ -756,7 +756,7 @@
                                     <ref role="cht4Q" to="i2y7:2Vizpn2Mx$T" resolve="VariableRef" />
                                   </node>
                                   <node concept="37vLTw" id="5st30ygCVnb" role="1m5AlR">
-                                    <ref role="3cqZAo" node="5st30ygCVnv" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hn" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="5st30ygCVnc" role="2OqNvi">
@@ -783,9 +783,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5st30ygCVnv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Hn" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5st30ygCVnw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ho" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -824,7 +824,7 @@
                     <node concept="3clFbF" id="7EZ1SpoR4qS" role="3cqZAp">
                       <node concept="2OqwBi" id="7EZ1SpoR4Ar" role="3clFbG">
                         <node concept="37vLTw" id="7EZ1SpoR4qh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7EZ1SpoQUCt" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Hp" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7EZ1SpoR85c" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -832,9 +832,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7EZ1SpoQUCt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Hp" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7EZ1SpoQUCu" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Hq" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/constraints.mps
index 811a9703d1e..79fdae2611d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/constraints.mps
@@ -79,7 +79,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -120,6 +120,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -167,7 +168,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -187,7 +188,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -470,12 +470,12 @@
                         <node concept="3clFbF" id="4QnOXkASy7Y" role="3cqZAp">
                           <node concept="37vLTI" id="4QnOXkASHJN" role="3clFbG">
                             <node concept="37vLTw" id="4QnOXkASHQr" role="37vLTx">
-                              <ref role="3cqZAo" node="4QnOXkASr5K" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Hr" resolve="it" />
                             </node>
                             <node concept="3EllGN" id="4QnOXkASAEU" role="37vLTJ">
                               <node concept="2OqwBi" id="4QnOXkASBdY" role="3ElVtu">
                                 <node concept="37vLTw" id="4QnOXkASAUq" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4QnOXkASr5K" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Hr" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4QnOXkASHkZ" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -496,7 +496,7 @@
                           <node concept="2Nt0df" id="4QnOXkASxUV" role="2OqNvi">
                             <node concept="2OqwBi" id="4QnOXkASxUW" role="38cxEo">
                               <node concept="37vLTw" id="4QnOXkASxUX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4QnOXkASr5K" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Hr" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="4QnOXkASxUY" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -507,9 +507,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4QnOXkASr5K" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Hr" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4QnOXkASr5L" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Hs" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -574,12 +574,12 @@
                         <node concept="3clFbF" id="3z9Ctyj9ECF" role="3cqZAp">
                           <node concept="37vLTI" id="3z9Ctyj9ECG" role="3clFbG">
                             <node concept="37vLTw" id="3z9Ctyj9ECH" role="37vLTx">
-                              <ref role="3cqZAo" node="3z9Ctyj9EyW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ht" resolve="it" />
                             </node>
                             <node concept="3EllGN" id="3z9Ctyj9ECI" role="37vLTJ">
                               <node concept="2OqwBi" id="3z9Ctyj9ECJ" role="3ElVtu">
                                 <node concept="37vLTw" id="3z9Ctyj9ECK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3z9Ctyj9EyW" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ht" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="3z9Ctyj9ECL" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -600,7 +600,7 @@
                           <node concept="2Nt0df" id="3z9Ctyj9ECQ" role="2OqNvi">
                             <node concept="2OqwBi" id="3z9Ctyj9ECR" role="38cxEo">
                               <node concept="37vLTw" id="3z9Ctyj9ECS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3z9Ctyj9EyW" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ht" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="3z9Ctyj9ECT" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -611,9 +611,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3z9Ctyj9EyW" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ht" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3z9Ctyj9EyX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Hu" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/editor.mps
index eb77301d29b..e6a07b80761 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/editor.mps
@@ -20,7 +20,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -45,7 +45,7 @@
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
@@ -76,7 +76,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -113,7 +113,7 @@
         <property id="1140017977771" name="readOnly" index="1Intyy" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ng" index="3EoQpk">
+      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ngI" index="3EoQpk">
         <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
@@ -129,7 +129,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -184,7 +184,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -195,6 +195,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -275,7 +276,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -284,7 +285,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -1348,7 +1348,7 @@
                               <node concept="2OqwBi" id="l3KBCjLr7e" role="3clFbG">
                                 <node concept="2OqwBi" id="l3KBCjLr7f" role="2Oq$k0">
                                   <node concept="37vLTw" id="l3KBCjLr7g" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="l3KBCjLr7j" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Hv" resolve="it" />
                                   </node>
                                   <node concept="3n3YKJ" id="l3KBCjLr7h" role="2OqNvi" />
                                 </node>
@@ -1356,9 +1356,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="l3KBCjLr7j" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Hv" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="l3KBCjLr7k" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Hw" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1369,15 +1369,15 @@
                           <node concept="3clFbF" id="4QnOXkAYNP2" role="3cqZAp">
                             <node concept="2OqwBi" id="4QnOXkAYNP3" role="3clFbG">
                               <node concept="37vLTw" id="4QnOXkAYNP4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4QnOXkAYNP6" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Hx" resolve="it" />
                               </node>
                               <node concept="3n3YKJ" id="4QnOXkAYNP5" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4QnOXkAYNP6" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Hx" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4QnOXkAYNP7" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Hy" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1389,14 +1389,14 @@
                           <node concept="17R0WA" id="4QnOXkAYNPc" role="3clFbG">
                             <node concept="ub8z3" id="4QnOXkAYNPd" role="3uHU7w" />
                             <node concept="37vLTw" id="4QnOXkAYNPe" role="3uHU7B">
-                              <ref role="3cqZAo" node="4QnOXkAYNPf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Hz" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4QnOXkAYNPf" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Hz" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4QnOXkAYNPg" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1H$" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1494,7 +1494,7 @@
                               <node concept="2OqwBi" id="1zVqtvfWALW" role="3clFbG">
                                 <node concept="2OqwBi" id="1zVqtvfWALX" role="2Oq$k0">
                                   <node concept="37vLTw" id="1zVqtvfWALY" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="l3KBCjLkU3" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1H_" resolve="it" />
                                   </node>
                                   <node concept="3n3YKJ" id="1zVqtvfWALZ" role="2OqNvi" />
                                 </node>
@@ -1502,9 +1502,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="l3KBCjLkU3" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1H_" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="l3KBCjLkU4" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1HA" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1515,15 +1515,15 @@
                           <node concept="3clFbF" id="4QnOXkBj5Py" role="3cqZAp">
                             <node concept="2OqwBi" id="4QnOXkBj5Pz" role="3clFbG">
                               <node concept="37vLTw" id="4QnOXkBj5P$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4QnOXkBj5PA" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1HB" resolve="it" />
                               </node>
                               <node concept="3n3YKJ" id="4QnOXkBj5P_" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4QnOXkBj5PA" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1HB" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4QnOXkBj5PB" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1HC" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1535,14 +1535,14 @@
                           <node concept="17R0WA" id="4QnOXkBj5PG" role="3clFbG">
                             <node concept="ub8z3" id="4QnOXkBj5PH" role="3uHU7w" />
                             <node concept="37vLTw" id="4QnOXkBj5PI" role="3uHU7B">
-                              <ref role="3cqZAo" node="4QnOXkBj5PJ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1HD" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4QnOXkBj5PJ" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1HD" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4QnOXkBj5PK" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1HE" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/intentions.mps
index 5b2e5396b19..673eb824673 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/intentions.mps
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/migration.mps
index 2080ead74df..d8bcfa9cf1d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -77,7 +77,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -91,7 +91,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -106,6 +106,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -229,7 +230,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -289,7 +290,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -471,7 +471,7 @@
                         <node concept="2OqwBi" id="1zVqtvgmFTK" role="3clFbG">
                           <node concept="2OqwBi" id="1zVqtvgmkA1" role="2Oq$k0">
                             <node concept="37vLTw" id="1zVqtvgmkjS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1zVqtvglWm1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Id" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="1zVqtvgmlf9" role="2OqNvi">
                               <ref role="3TtcxE" to="i2y7:4QnOXkA74jv" resolve="values" />
@@ -480,7 +480,7 @@
                           <node concept="X8dFx" id="1zVqtvgnzg8" role="2OqNvi">
                             <node concept="2OqwBi" id="1zVqtvgnzga" role="25WWJ7">
                               <node concept="37vLTw" id="1zVqtvgnzgb" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1zVqtvglWm1" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Id" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="1zVqtvgnzgc" role="2OqNvi">
                                 <ref role="3TtcxE" to="i2y7:4T_y5Me_pOo" resolve="commands_old" />
@@ -493,7 +493,7 @@
                         <node concept="2OqwBi" id="1zVqtvgn_Ay" role="3clFbG">
                           <node concept="2OqwBi" id="1zVqtvgn_Az" role="2Oq$k0">
                             <node concept="37vLTw" id="1zVqtvgn_A$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1zVqtvglWm1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Id" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="1zVqtvgn_A_" role="2OqNvi">
                               <ref role="3TtcxE" to="i2y7:4QnOXkA74jv" resolve="values" />
@@ -502,7 +502,7 @@
                           <node concept="X8dFx" id="1zVqtvgn_AA" role="2OqNvi">
                             <node concept="2OqwBi" id="1zVqtvgn_AB" role="25WWJ7">
                               <node concept="37vLTw" id="1zVqtvgn_AC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1zVqtvglWm1" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Id" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="1zVqtvgnW9D" role="2OqNvi">
                                 <ref role="3TtcxE" to="i2y7:6_CUGSFJ0IW" resolve="targets_old" />
@@ -512,9 +512,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1zVqtvglWm1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Id" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1zVqtvglWm2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ie" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -667,7 +667,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfUo" role="28ntcv">
                                           <node concept="2OqwBi" id="115mCuKBl6F" role="WxPPp">
                                             <node concept="37vLTw" id="115mCuKBkHT" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4QnOXkA9x3j" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Ih" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="115mCuKBlBV" role="2OqNvi">
                                               <ref role="3TsBF5" to="i2y7:6_CUGSFKl0k" resolve="command" />
@@ -692,7 +692,7 @@
                                 <node concept="2OqwBi" id="7EZ1Spl6wWY" role="2Oq$k0">
                                   <node concept="2OqwBi" id="7EZ1Spl6wWZ" role="2Oq$k0">
                                     <node concept="37vLTw" id="7EZ1Spl6wX0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4QnOXkA9x3j" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ih" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="7EZ1Spl6wX1" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
@@ -711,7 +711,7 @@
                                         <node concept="17R0WA" id="7EZ1Spl6wX8" role="3clFbG">
                                           <node concept="2OqwBi" id="7EZ1Spl6wX9" role="3uHU7B">
                                             <node concept="37vLTw" id="7EZ1Spl6wXa" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7EZ1Spl6wXd" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1If" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="7EZ1Spl6wXb" role="2OqNvi">
                                               <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -724,9 +724,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7EZ1Spl6wXd" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1If" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="7EZ1Spl6wXe" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Ig" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -802,7 +802,7 @@
                           <node concept="3clFbF" id="4QnOXkA9xdg" role="3cqZAp">
                             <node concept="2OqwBi" id="4QnOXkA9$KN" role="3clFbG">
                               <node concept="37vLTw" id="4QnOXkA9$sR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4QnOXkA9x3j" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ih" resolve="it" />
                               </node>
                               <node concept="1P9Npp" id="ErGx9VgjRl" role="2OqNvi">
                                 <node concept="37vLTw" id="7EZ1Spl4sHl" role="1P9ThW">
@@ -816,7 +816,7 @@
                           <node concept="2OqwBi" id="7EZ1SpnoR9v" role="2Oq$k0">
                             <node concept="2OqwBi" id="7EZ1SpnoJbx" role="2Oq$k0">
                               <node concept="37vLTw" id="7EZ1SpnoIN_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4QnOXkA9x3j" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ih" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7EZ1SpnoNdX" role="2OqNvi">
                                 <ref role="3TsBF5" to="i2y7:6_CUGSFKl0k" resolve="command" />
@@ -828,9 +828,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4QnOXkA9x3j" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ih" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4QnOXkA9x3k" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ii" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -938,7 +938,7 @@
                                       <node concept="2OqwBi" id="7EZ1SpkY9v8" role="WxPPp">
                                         <node concept="2OqwBi" id="7EZ1SpkY9v9" role="2Oq$k0">
                                           <node concept="37vLTw" id="7EZ1SpkY9va" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="64pi6e6Fi81" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Il" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="7EZ1SpkY9vb" role="2OqNvi">
                                             <ref role="3TsBF5" to="i2y7:2Vizpn2LYpC" resolve="value_old" />
@@ -963,7 +963,7 @@
                                 <node concept="2OqwBi" id="7EZ1SpkZ0mW" role="2Oq$k0">
                                   <node concept="2OqwBi" id="7EZ1SpkZ0mX" role="2Oq$k0">
                                     <node concept="37vLTw" id="7EZ1SpkZ0mY" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="64pi6e6Fi81" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Il" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="7EZ1SpkZ0mZ" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
@@ -982,7 +982,7 @@
                                         <node concept="17R0WA" id="7EZ1SpkZ0n6" role="3clFbG">
                                           <node concept="2OqwBi" id="7EZ1SpkZ0n8" role="3uHU7B">
                                             <node concept="37vLTw" id="7EZ1SpkZ0n9" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7EZ1SpkZ0nb" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Ij" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="7EZ1Spl2S1l" role="2OqNvi">
                                               <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -995,9 +995,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7EZ1SpkZ0nb" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1Ij" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="7EZ1SpkZ0nc" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Ik" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1064,7 +1064,7 @@
                             <node concept="2OqwBi" id="64pi6e6Frl5" role="3clFbG">
                               <node concept="2OqwBi" id="64pi6e6Fir1" role="2Oq$k0">
                                 <node concept="37vLTw" id="64pi6e6Fifj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="64pi6e6Fi81" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Il" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="64pi6e6Fmvd" role="2OqNvi">
                                   <ref role="3TtcxE" to="i2y7:64pi6e6ETYT" resolve="valueItems" />
@@ -1082,7 +1082,7 @@
                               <node concept="10Nm6u" id="64pi6e6HJnZ" role="37vLTx" />
                               <node concept="2OqwBi" id="64pi6e6HAOa" role="37vLTJ">
                                 <node concept="37vLTw" id="64pi6e6HAvu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="64pi6e6Fi81" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Il" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="64pi6e6HF5B" role="2OqNvi">
                                   <ref role="3TsBF5" to="i2y7:2Vizpn2LYpC" resolve="value_old" />
@@ -1103,7 +1103,7 @@
                           <node concept="2OqwBi" id="64pi6e6G5zV" role="2Oq$k0">
                             <node concept="2OqwBi" id="64pi6e6G1oz" role="2Oq$k0">
                               <node concept="37vLTw" id="64pi6e6G16E" role="2Oq$k0">
-                                <ref role="3cqZAo" node="64pi6e6Fi81" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Il" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="64pi6e6G5cv" role="2OqNvi">
                                 <ref role="3TsBF5" to="i2y7:2Vizpn2LYpC" resolve="value_old" />
@@ -1115,9 +1115,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="64pi6e6Fi81" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Il" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="64pi6e6Fi82" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Im" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1305,7 +1305,7 @@
                                       <node concept="2OqwBi" id="7EZ1SpnTHRM" role="WxPPp">
                                         <node concept="2OqwBi" id="7EZ1SpnTHRN" role="2Oq$k0">
                                           <node concept="37vLTw" id="7EZ1SpnTHRO" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="7EZ1SpnUEvQ" role="2OqNvi">
                                             <ref role="3TsBF5" to="i2y7:2b2D8jTN8iH" resolve="leftArg_old" />
@@ -1330,7 +1330,7 @@
                                 <node concept="2OqwBi" id="7EZ1SpnTHRW" role="2Oq$k0">
                                   <node concept="2OqwBi" id="7EZ1SpnTHRX" role="2Oq$k0">
                                     <node concept="37vLTw" id="7EZ1SpnTHRY" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="7EZ1SpnTHRZ" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
@@ -1349,7 +1349,7 @@
                                         <node concept="17R0WA" id="7EZ1SpnTHS6" role="3clFbG">
                                           <node concept="2OqwBi" id="7EZ1SpnTHS7" role="3uHU7B">
                                             <node concept="37vLTw" id="7EZ1SpnTHS8" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7EZ1SpnTHSb" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1In" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="7EZ1SpnTHS9" role="2OqNvi">
                                               <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -1362,9 +1362,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7EZ1SpnTHSb" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1In" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="7EZ1SpnTHSc" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Io" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1434,7 +1434,7 @@
                               </node>
                               <node concept="2OqwBi" id="7EZ1SpnTHSB" role="37vLTJ">
                                 <node concept="37vLTw" id="7EZ1SpnTHSC" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7EZ1SpnVJ0z" role="2OqNvi">
                                   <ref role="3Tt5mk" to="i2y7:7EZ1SpnTEea" resolve="leftArg" />
@@ -1447,7 +1447,7 @@
                               <node concept="10Nm6u" id="7EZ1SpnTHSI" role="37vLTx" />
                               <node concept="2OqwBi" id="7EZ1SpnTHSJ" role="37vLTJ">
                                 <node concept="37vLTw" id="7EZ1SpnTHSK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7EZ1SpnWd0O" role="2OqNvi">
                                   <ref role="3TsBF5" to="i2y7:2b2D8jTN8iH" resolve="leftArg_old" />
@@ -1468,7 +1468,7 @@
                           <node concept="2OqwBi" id="7EZ1SpnTHSR" role="2Oq$k0">
                             <node concept="2OqwBi" id="7EZ1SpnUhUJ" role="2Oq$k0">
                               <node concept="37vLTw" id="7EZ1SpnU7rg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7EZ1SpnUvU9" role="2OqNvi">
                                 <ref role="3TsBF5" to="i2y7:2b2D8jTN8iH" resolve="leftArg_old" />
@@ -1497,7 +1497,7 @@
                                       <node concept="2OqwBi" id="7EZ1SpnWdXw" role="WxPPp">
                                         <node concept="2OqwBi" id="7EZ1SpnWdXx" role="2Oq$k0">
                                           <node concept="37vLTw" id="7EZ1SpnWdXy" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="7EZ1SpnWrvk" role="2OqNvi">
                                             <ref role="3TsBF5" to="i2y7:2b2D8jTN8SH" resolve="rightArg_old" />
@@ -1522,7 +1522,7 @@
                                 <node concept="2OqwBi" id="7EZ1SpnWdXE" role="2Oq$k0">
                                   <node concept="2OqwBi" id="7EZ1SpnWdXF" role="2Oq$k0">
                                     <node concept="37vLTw" id="7EZ1SpnWdXG" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="7EZ1SpnWdXH" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
@@ -1541,7 +1541,7 @@
                                         <node concept="17R0WA" id="7EZ1SpnWdXO" role="3clFbG">
                                           <node concept="2OqwBi" id="7EZ1SpnWdXP" role="3uHU7B">
                                             <node concept="37vLTw" id="7EZ1SpnWdXQ" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7EZ1SpnWdXT" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Ip" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="7EZ1SpnWdXR" role="2OqNvi">
                                               <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -1554,9 +1554,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7EZ1SpnWdXT" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1Ip" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="7EZ1SpnWdXU" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Iq" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1626,7 +1626,7 @@
                               </node>
                               <node concept="2OqwBi" id="7EZ1SpnWdYm" role="37vLTJ">
                                 <node concept="37vLTw" id="7EZ1SpnWdYn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7EZ1SpnWxuI" role="2OqNvi">
                                   <ref role="3Tt5mk" to="i2y7:7EZ1SpnTEeg" resolve="rightArg" />
@@ -1639,7 +1639,7 @@
                               <node concept="10Nm6u" id="7EZ1SpnWdYr" role="37vLTx" />
                               <node concept="2OqwBi" id="7EZ1SpnWdYs" role="37vLTJ">
                                 <node concept="37vLTw" id="7EZ1SpnWdYt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7EZ1SpnW_$K" role="2OqNvi">
                                   <ref role="3TsBF5" to="i2y7:2b2D8jTN8SH" resolve="rightArg_old" />
@@ -1660,7 +1660,7 @@
                           <node concept="2OqwBi" id="7EZ1SpnWdY$" role="2Oq$k0">
                             <node concept="2OqwBi" id="7EZ1SpnWdY_" role="2Oq$k0">
                               <node concept="37vLTw" id="7EZ1SpnWdYA" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7EZ1SpnTHSX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ir" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7EZ1SpnWj9j" role="2OqNvi">
                                 <ref role="3TsBF5" to="i2y7:2b2D8jTN8SH" resolve="rightArg_old" />
@@ -1673,9 +1673,9 @@
                       </node>
                       <node concept="3clFbH" id="7EZ1SpnWdxS" role="3cqZAp" />
                     </node>
-                    <node concept="Rh6nW" id="7EZ1SpnTHSX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ir" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7EZ1SpnTHSY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Is" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1815,7 +1815,7 @@
                                           <node concept="2OqwBi" id="7EZ1SpoOQGd" role="WxPPp">
                                             <node concept="2OqwBi" id="7EZ1SpoOQGe" role="2Oq$k0">
                                               <node concept="37vLTw" id="7EZ1SpoOQGf" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                                               </node>
                                               <node concept="3TrcHB" id="7EZ1SpoOQGg" role="2OqNvi">
                                                 <ref role="3TsBF5" to="i2y7:5ak6HMA0Exu" resolve="target_old" />
@@ -1842,7 +1842,7 @@
                                 <node concept="2OqwBi" id="7EZ1SpmMYXP" role="2Oq$k0">
                                   <node concept="2OqwBi" id="7EZ1SpmMYXQ" role="2Oq$k0">
                                     <node concept="37vLTw" id="7EZ1SpmMYXR" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                                     </node>
                                     <node concept="3Tsc0h" id="7EZ1SpmMYXS" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
@@ -1861,7 +1861,7 @@
                                         <node concept="17R0WA" id="7EZ1SpmMYXZ" role="3clFbG">
                                           <node concept="2OqwBi" id="7EZ1SpmMYY0" role="3uHU7B">
                                             <node concept="37vLTw" id="7EZ1SpmMYY1" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7EZ1SpmMYY4" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1It" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="7EZ1SpmMYY2" role="2OqNvi">
                                               <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -1874,9 +1874,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7EZ1SpmMYY4" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1It" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="7EZ1SpmMYY5" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Iu" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1951,7 +1951,7 @@
                             <node concept="2OqwBi" id="7EZ1SpmPwo8" role="3clFbG">
                               <node concept="2OqwBi" id="7EZ1SpmOOAO" role="2Oq$k0">
                                 <node concept="37vLTw" id="7EZ1SpmOLku" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                                 </node>
                                 <node concept="3Tsc0h" id="7EZ1SpoQD$R" role="2OqNvi">
                                   <ref role="3TtcxE" to="i2y7:7EZ1SpoQ$Qm" resolve="targets" />
@@ -1969,7 +1969,7 @@
                               <node concept="10Nm6u" id="7EZ1SpmQXw4" role="37vLTx" />
                               <node concept="2OqwBi" id="7EZ1SpmQaJF" role="37vLTJ">
                                 <node concept="37vLTw" id="7EZ1SpmQ718" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                                 </node>
                                 <node concept="3TrcHB" id="7EZ1SpmQw$H" role="2OqNvi">
                                   <ref role="3TsBF5" to="i2y7:5ak6HMA0Exu" resolve="target_old" />
@@ -1990,7 +1990,7 @@
                           <node concept="2OqwBi" id="7EZ1Spnorfu" role="2Oq$k0">
                             <node concept="2OqwBi" id="7EZ1SpnnYhJ" role="2Oq$k0">
                               <node concept="37vLTw" id="7EZ1SpnnYhK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                               </node>
                               <node concept="3TrcHB" id="7EZ1SpnnYhL" role="2OqNvi">
                                 <ref role="3TsBF5" to="i2y7:5ak6HMA0Exu" resolve="target_old" />
@@ -2022,7 +2022,7 @@
                         <node concept="2OqwBi" id="7EZ1SpmcQsw" role="3clFbG">
                           <node concept="2OqwBi" id="7EZ1Spmccd2" role="2Oq$k0">
                             <node concept="37vLTw" id="7EZ1Spmc8Oc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                             </node>
                             <node concept="3Tsc0h" id="7EZ1SpmcxtG" role="2OqNvi">
                               <ref role="3TtcxE" to="i2y7:5ak6HMA0Exz" resolve="dependencies_old" />
@@ -2063,7 +2063,7 @@
                                                         <ref role="cht4Q" to="i2y7:bzEfeAYj5d" resolve="ModuleRefDependency" />
                                                       </node>
                                                       <node concept="37vLTw" id="7EZ1Spmiaus" role="1m5AlR">
-                                                        <ref role="3cqZAo" node="7EZ1SpmdjZb" resolve="dependency" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN1Ix" resolve="dependency" />
                                                       </node>
                                                     </node>
                                                     <node concept="3TrEf2" id="7EZ1SpmiFdc" role="2OqNvi">
@@ -2100,7 +2100,7 @@
                                                         <ref role="cht4Q" to="i2y7:Dp4TemBLBT" resolve="TargetDependency" />
                                                       </node>
                                                       <node concept="37vLTw" id="7EZ1Spmh2Ub" role="1m5AlR">
-                                                        <ref role="3cqZAo" node="7EZ1SpmdjZb" resolve="dependency" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN1Ix" resolve="dependency" />
                                                       </node>
                                                     </node>
                                                     <node concept="3TrEf2" id="7EZ1Spmh2Uc" role="2OqNvi">
@@ -2117,7 +2117,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="7EZ1SpmfNhh" role="1_3QMn">
                                     <node concept="37vLTw" id="7EZ1SpmfLqY" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7EZ1SpmdjZb" resolve="dependency" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ix" resolve="dependency" />
                                     </node>
                                     <node concept="2yIwOk" id="7EZ1Spmg8Z0" role="2OqNvi" />
                                   </node>
@@ -2141,7 +2141,7 @@
                                                           <ref role="cht4Q" to="i2y7:5ak6HMA0Fdz" resolve="TextDependency" />
                                                         </node>
                                                         <node concept="37vLTw" id="7EZ1Spmj3A$" role="1m5AlR">
-                                                          <ref role="3cqZAo" node="7EZ1SpmdjZb" resolve="dependency" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN1Ix" resolve="dependency" />
                                                         </node>
                                                       </node>
                                                       <node concept="3TrcHB" id="7EZ1Spmjgol" role="2OqNvi">
@@ -2170,7 +2170,7 @@
                                             <node concept="2OqwBi" id="7EZ1Spm$U0U" role="2Oq$k0">
                                               <node concept="2OqwBi" id="7EZ1Spm$U0V" role="2Oq$k0">
                                                 <node concept="37vLTw" id="7EZ1Spm$WsY" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="7EZ1SpmdjZb" resolve="dependency" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Ix" resolve="dependency" />
                                                 </node>
                                                 <node concept="3Tsc0h" id="7EZ1Spm$U0X" role="2OqNvi">
                                                   <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
@@ -2189,7 +2189,7 @@
                                                     <node concept="17R0WA" id="7EZ1Spm$U14" role="3clFbG">
                                                       <node concept="2OqwBi" id="7EZ1Spm$U15" role="3uHU7B">
                                                         <node concept="37vLTw" id="7EZ1Spm$U16" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="7EZ1Spm$U19" resolve="it" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN1Iv" resolve="it" />
                                                         </node>
                                                         <node concept="2qgKlT" id="7EZ1Spm$U17" role="2OqNvi">
                                                           <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -2202,9 +2202,9 @@
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="Rh6nW" id="7EZ1Spm$U19" role="1bW2Oz">
+                                                <node concept="gl6BB" id="2SR9xrsN1Iv" role="1bW2Oz">
                                                   <property role="TrG5h" value="it" />
-                                                  <node concept="2jxLKc" id="7EZ1Spm$U1a" role="1tU5fm" />
+                                                  <node concept="2jxLKc" id="2SR9xrsN1Iw" role="1tU5fm" />
                                                 </node>
                                               </node>
                                             </node>
@@ -2303,7 +2303,7 @@
                                       <node concept="2OqwBi" id="7EZ1Spmc4he" role="2Oq$k0">
                                         <node concept="2OqwBi" id="7EZ1Spmc4hf" role="2Oq$k0">
                                           <node concept="37vLTw" id="7EZ1Spmc4hg" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7EZ1SpmdjZb" resolve="dependency" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Ix" resolve="dependency" />
                                           </node>
                                           <node concept="3Tsc0h" id="7EZ1Spmc4hh" role="2OqNvi">
                                             <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
@@ -2365,7 +2365,7 @@
                                   <node concept="2OqwBi" id="7EZ1SpmeTxd" role="3clFbG">
                                     <node concept="2OqwBi" id="7EZ1SpmewDD" role="2Oq$k0">
                                       <node concept="37vLTw" id="7EZ1SpmetDv" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                                       </node>
                                       <node concept="3Tsc0h" id="7EZ1SpoQIO7" role="2OqNvi">
                                         <ref role="3TtcxE" to="i2y7:7EZ1SpoQ$QB" resolve="prerequisites" />
@@ -2381,15 +2381,15 @@
                                 <node concept="3clFbF" id="7EZ1Spmc4hN" role="3cqZAp">
                                   <node concept="2OqwBi" id="7EZ1Spmc4hQ" role="3clFbG">
                                     <node concept="37vLTw" id="7EZ1Spmdw8H" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7EZ1SpmdjZb" resolve="dependency" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ix" resolve="dependency" />
                                     </node>
                                     <node concept="3YRAZt" id="7EZ1Spme1ab" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7EZ1SpmdjZb" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Ix" role="1bW2Oz">
                                 <property role="TrG5h" value="dependency" />
-                                <node concept="2jxLKc" id="7EZ1SpmdjZc" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Iy" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2425,7 +2425,7 @@
                         <node concept="2OqwBi" id="1zVqtvgsvFa" role="3clFbG">
                           <node concept="2OqwBi" id="1zVqtvgsvFb" role="2Oq$k0">
                             <node concept="37vLTw" id="1zVqtvgsvFc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                             </node>
                             <node concept="3Tsc0h" id="1zVqtvgsILz" role="2OqNvi">
                               <ref role="3TtcxE" to="i2y7:1zVqtvgpDxJ" resolve="recipes" />
@@ -2434,7 +2434,7 @@
                           <node concept="X8dFx" id="1zVqtvgsvFe" role="2OqNvi">
                             <node concept="2OqwBi" id="1zVqtvgsvFf" role="25WWJ7">
                               <node concept="37vLTw" id="1zVqtvgsvFg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                               </node>
                               <node concept="3Tsc0h" id="1zVqtvgsvFh" role="2OqNvi">
                                 <ref role="3TtcxE" to="i2y7:5ak6HMA0Ex$" resolve="commands_old" />
@@ -2447,7 +2447,7 @@
                         <node concept="2OqwBi" id="1zVqtvgsvFj" role="3clFbG">
                           <node concept="2OqwBi" id="1zVqtvgsvFk" role="2Oq$k0">
                             <node concept="37vLTw" id="1zVqtvgsvFl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                             </node>
                             <node concept="3Tsc0h" id="1zVqtvgt65K" role="2OqNvi">
                               <ref role="3TtcxE" to="i2y7:1zVqtvgpDxJ" resolve="recipes" />
@@ -2456,7 +2456,7 @@
                           <node concept="X8dFx" id="1zVqtvgsvFn" role="2OqNvi">
                             <node concept="2OqwBi" id="1zVqtvgsvFo" role="25WWJ7">
                               <node concept="37vLTw" id="1zVqtvgsvFp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1zVqtvgsvFr" resolve="rule" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Iz" resolve="rule" />
                               </node>
                               <node concept="3Tsc0h" id="1zVqtvguc07" role="2OqNvi">
                                 <ref role="3TtcxE" to="i2y7:2b2D8jTPIPW" resolve="conditionalDirectives_old" />
@@ -2466,9 +2466,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1zVqtvgsvFr" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Iz" role="1bW2Oz">
                       <property role="TrG5h" value="rule" />
-                      <node concept="2jxLKc" id="1zVqtvgsvFs" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1I$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2576,7 +2576,7 @@
                                       <node concept="2OqwBi" id="2NUzdxFf2fG" role="36biLW">
                                         <node concept="2OqwBi" id="2NUzdxFeZi0" role="2Oq$k0">
                                           <node concept="37vLTw" id="2NUzdxFeYBU" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2NUzdxFeaK6" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1ID" resolve="it" />
                                           </node>
                                           <node concept="3Tsc0h" id="2NUzdxFf0pz" role="2OqNvi">
                                             <ref role="3TtcxE" to="i2y7:64pi6e6ETYT" resolve="valueItems" />
@@ -2588,15 +2588,15 @@
                                               <node concept="3clFbF" id="2NUzdxFf7io" role="3cqZAp">
                                                 <node concept="2OqwBi" id="2NUzdxFf7YH" role="3clFbG">
                                                   <node concept="37vLTw" id="2NUzdxFf7in" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="2NUzdxFf6uX" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1I_" resolve="it" />
                                                   </node>
                                                   <node concept="1$rogu" id="2NUzdxFf8Uv" role="2OqNvi" />
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="2NUzdxFf6uX" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN1I_" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="2NUzdxFf6uY" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN1IA" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -2612,7 +2612,7 @@
                             <node concept="2OqwBi" id="2NUzdxFeFEf" role="3clFbG">
                               <node concept="2OqwBi" id="2NUzdxFeC_r" role="2Oq$k0">
                                 <node concept="37vLTw" id="2NUzdxFeC65" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2NUzdxFeaK6" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1ID" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="2NUzdxFeDxj" role="2OqNvi">
                                   <ref role="3TtcxE" to="i2y7:2NUzdxFe9VC" resolve="values" />
@@ -2629,7 +2629,7 @@
                             <node concept="2OqwBi" id="2NUzdxFex52" role="3clFbG">
                               <node concept="2OqwBi" id="2NUzdxFeuCw" role="2Oq$k0">
                                 <node concept="37vLTw" id="2NUzdxFeuaQ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2NUzdxFeaK6" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1ID" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="2NUzdxFevqm" role="2OqNvi">
                                   <ref role="3TtcxE" to="i2y7:64pi6e6ETYT" resolve="valueItems" />
@@ -2641,15 +2641,15 @@
                                     <node concept="3clFbF" id="2NUzdxFe_dq" role="3cqZAp">
                                       <node concept="2OqwBi" id="2NUzdxFe_E3" role="3clFbG">
                                         <node concept="37vLTw" id="2NUzdxFe_dp" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2NUzdxFe$yF" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1IB" resolve="it" />
                                         </node>
                                         <node concept="3YRAZt" id="2NUzdxFeAp1" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="2NUzdxFe$yF" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1IB" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="2NUzdxFe$yG" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1IC" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -2659,7 +2659,7 @@
                         <node concept="2OqwBi" id="2NUzdxFehh$" role="3clFbw">
                           <node concept="2OqwBi" id="2NUzdxFeeAL" role="2Oq$k0">
                             <node concept="37vLTw" id="2NUzdxFee6y" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2NUzdxFeaK6" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1ID" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="2NUzdxFefon" role="2OqNvi">
                               <ref role="3TtcxE" to="i2y7:64pi6e6ETYT" resolve="valueItems" />
@@ -2669,9 +2669,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2NUzdxFeaK6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1ID" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2NUzdxFeaK7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1IE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps
index 3dc052a4e71..3498d24ceed 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps
@@ -91,7 +91,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -231,7 +231,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -263,7 +263,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -298,6 +298,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -420,7 +421,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -464,7 +465,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -881,7 +881,7 @@
                                       <property role="3cmrfH" value="0" />
                                     </node>
                                     <node concept="37vLTw" id="5zgShfbCz4c" role="1LFl5Q">
-                                      <ref role="3cqZAo" node="5zgShfbCz4e" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1HF" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -893,9 +893,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5zgShfbCz4e" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1HF" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5zgShfbCz4f" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1HG" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3361,7 +3361,7 @@
                                 <node concept="2OqwBi" id="1dvvq0Z9XJd" role="3clFbG">
                                   <node concept="2OqwBi" id="1dvvq0Z9Qvj" role="2Oq$k0">
                                     <node concept="37vLTw" id="1dvvq0Z9Q27" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1dvvq0Z866k" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1HJ" resolve="it" />
                                     </node>
                                     <node concept="2sxana" id="1dvvq0Z9V7d" role="2OqNvi">
                                       <ref role="2sxfKC" to="fn29:1Xl3kQ1uadN" resolve="models" />
@@ -3375,7 +3375,7 @@
                                             <ref role="1Pybhc" node="1dvvq0Z5uU1" resolve="UsedLanguageCollector" />
                                             <ref role="37wK5l" node="1dvvq0Z6mPs" resolve="usedLanguages" />
                                             <node concept="37vLTw" id="1dvvq0Za0z2" role="37wK5m">
-                                              <ref role="3cqZAo" node="1dvvq0Z9Z3T" resolve="model" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1HH" resolve="model" />
                                             </node>
                                             <node concept="37vLTw" id="1dvvq0Z8Cyx" role="37wK5m">
                                               <ref role="3cqZAo" node="1dvvq0YIWkB" resolve="additionalLanguages" />
@@ -3383,9 +3383,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="1dvvq0Z9Z3T" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1HH" role="1bW2Oz">
                                         <property role="TrG5h" value="model" />
-                                        <node concept="2jxLKc" id="1dvvq0Z9Z3U" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1HI" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -3393,9 +3393,9 @@
                               </node>
                               <node concept="3clFbH" id="1dvvq0Z9PCk" role="3cqZAp" />
                             </node>
-                            <node concept="Rh6nW" id="1dvvq0Z866k" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1HJ" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1dvvq0Z866l" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1HK" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3678,7 +3678,7 @@
                       <ref role="37wK5l" node="34wrZhDTzq3" resolve="usedLanguagesInternal" />
                       <node concept="2OqwBi" id="7raGfT8QhE1" role="37wK5m">
                         <node concept="37vLTw" id="7raGfT8QhtI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7raGfT8QgT4" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1HL" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7raGfT8QhUw" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -3701,9 +3701,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7raGfT8QgT4" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1HL" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7raGfT8QgT5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1HM" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps
index 001fae766a5..5a3f4ccdadf 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps
@@ -87,7 +87,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/textGen.mps
index 8dcd257ff46..3f0118db80f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/textGen.mps
@@ -39,7 +39,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -110,7 +110,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/typesystem.mps
index 729ab77f336..1268f129c0d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/typesystem.mps
@@ -108,7 +108,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -132,6 +132,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
         <child id="1200830928149" name="expression" index="2n6tg2" />
       </concept>
@@ -293,7 +294,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -317,7 +318,6 @@
         <child id="1224414466839" name="initializer" index="kMx8a" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -678,7 +678,7 @@
                       <node concept="17R0WA" id="7EZ1Spm$U14" role="3clFbG">
                         <node concept="2OqwBi" id="7EZ1Spm$U15" role="3uHU7B">
                           <node concept="37vLTw" id="7EZ1Spm$U16" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7EZ1Spm$U19" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1HN" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7EZ1Spm$U17" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -691,9 +691,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7EZ1Spm$U19" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1HN" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7EZ1Spm$U1a" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1HO" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1034,7 +1034,7 @@
                                       <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
                                       <node concept="2OqwBi" id="7EZ1Spof9pJ" role="37wK5m">
                                         <node concept="37vLTw" id="7EZ1Spof9pK" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7EZ1Spof9pM" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1HP" resolve="it" />
                                         </node>
                                         <node concept="3n3YKJ" id="7EZ1Spof9pL" role="2OqNvi" />
                                       </node>
@@ -1042,9 +1042,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7EZ1Spof9pM" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1HP" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7EZ1Spof9pN" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1HQ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1553,15 +1553,15 @@
                             <node concept="3clFbF" id="l3KBCjXKxk" role="3cqZAp">
                               <node concept="2OqwBi" id="l3KBCjXKYu" role="3clFbG">
                                 <node concept="37vLTw" id="l3KBCjXKxj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="l3KBCjXKfq" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1HR" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="l3KBCjXLs3" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="l3KBCjXKfq" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1HR" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="l3KBCjXKfr" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1HS" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="1nlBCl" id="l3KBCjXKfs" role="2S7zOq">
@@ -1576,7 +1576,7 @@
                             <node concept="17R0WA" id="l3KBCjW0VY" role="3clFbG">
                               <node concept="2OqwBi" id="l3KBCjW0VZ" role="3uHU7B">
                                 <node concept="37vLTw" id="l3KBCjW0W0" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="l3KBCjW0W5" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1HT" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="l3KBCjW0W1" role="2OqNvi">
                                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -1593,9 +1593,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="l3KBCjW0W5" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1HT" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="l3KBCjW0W6" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1HU" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1821,7 +1821,7 @@
                           <node concept="2OqwBi" id="1zVqtvfWALW" role="3clFbG">
                             <node concept="2OqwBi" id="1zVqtvfWALX" role="2Oq$k0">
                               <node concept="37vLTw" id="1zVqtvfWALY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="l3KBCjLkU3" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1HV" resolve="it" />
                               </node>
                               <node concept="3n3YKJ" id="1zVqtvfWALZ" role="2OqNvi" />
                             </node>
@@ -1829,9 +1829,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="l3KBCjLkU3" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1HV" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="l3KBCjLkU4" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1HW" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1853,7 +1853,7 @@
                             <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
                             <node concept="2OqwBi" id="4QnOXkB8GEA" role="37wK5m">
                               <node concept="37vLTw" id="4QnOXkB8GEB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4QnOXkB8GED" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1HX" resolve="it" />
                               </node>
                               <node concept="3n3YKJ" id="4QnOXkB8GEC" role="2OqNvi" />
                             </node>
@@ -1861,9 +1861,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4QnOXkB8GED" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1HX" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4QnOXkB8GEE" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1HY" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2008,15 +2008,15 @@
                             <node concept="3clFbF" id="l3KBCjYLcj" role="3cqZAp">
                               <node concept="2OqwBi" id="l3KBCjYL_R" role="3clFbG">
                                 <node concept="37vLTw" id="l3KBCjYLci" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="l3KBCjYKJ8" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1HZ" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="l3KBCjYNFs" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="l3KBCjYKJ8" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1HZ" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="l3KBCjYKJ9" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1I0" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="1nlBCl" id="l3KBCjYKJa" role="2S7zOq">
@@ -2041,7 +2041,7 @@
                                 <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
                                 <node concept="2OqwBi" id="7EZ1SpnYREs" role="37wK5m">
                                   <node concept="37vLTw" id="7EZ1SpnYREt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7EZ1SpnYREy" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1I1" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="7EZ1Spo18wO" role="2OqNvi">
                                     <ref role="37wK5l" to="vog7:7EZ1Spo0Yz_" resolve="getReferencePresentation" />
@@ -2057,9 +2057,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7EZ1SpnYREy" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1I1" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7EZ1SpnYREz" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1I2" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2822,7 +2822,7 @@
                     <node concept="1Wc70l" id="ErGx9VwEtO" role="3clFbG">
                       <node concept="2OqwBi" id="ErGx9VwERl" role="3uHU7B">
                         <node concept="37vLTw" id="ErGx9VwEAd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="ErGx9V8T7r" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1I3" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="ErGx9VwGkv" role="2OqNvi">
                           <node concept="chp4Y" id="ErGx9VwGxG" role="cj9EA">
@@ -2838,7 +2838,7 @@
                                 <ref role="cht4Q" to="i2y7:2Vizpn2Mx$z" resolve="PlainTextFragment" />
                               </node>
                               <node concept="37vLTw" id="ErGx9V90CQ" role="1m5AlR">
-                                <ref role="3cqZAo" node="ErGx9V8T7r" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1I3" resolve="it" />
                               </node>
                             </node>
                             <node concept="3TrcHB" id="ErGx9V93R9" role="2OqNvi">
@@ -2852,9 +2852,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="ErGx9V8T7r" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1I3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="ErGx9V8T7s" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1I4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3477,7 +3477,7 @@
                           <node concept="17R0WA" id="7EZ1Spo1rUI" role="3clFbG">
                             <node concept="2OqwBi" id="7EZ1Spo1rUJ" role="3uHU7B">
                               <node concept="37vLTw" id="7EZ1Spo1rUK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7EZ1Spo1rUN" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1I5" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="7EZ1Spo1rUL" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:1avfQ4BBzOo" resolve="getProperty" />
@@ -3490,9 +3490,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7EZ1Spo1rUN" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1I5" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7EZ1Spo1rUO" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1I6" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3905,7 +3905,7 @@
                               <ref role="cht4Q" to="i2y7:2Vizpn2Mx$z" resolve="PlainTextFragment" />
                             </node>
                             <node concept="37vLTw" id="2NUzdxFkL0g" role="1m5AlR">
-                              <ref role="3cqZAo" node="2NUzdxFkG1W" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1I7" resolve="it" />
                             </node>
                           </node>
                           <node concept="3TrcHB" id="2NUzdxFkLND" role="2OqNvi">
@@ -3918,7 +3918,7 @@
                     </node>
                     <node concept="2OqwBi" id="2NUzdxFkGuc" role="3uHU7B">
                       <node concept="37vLTw" id="2NUzdxFkGf1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2NUzdxFkG1W" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1I7" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="2NUzdxFkGJW" role="2OqNvi">
                         <node concept="chp4Y" id="2NUzdxFkH04" role="cj9EA">
@@ -3929,9 +3929,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="2NUzdxFkG1W" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1I7" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="2NUzdxFkG1X" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1I8" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -4020,7 +4020,7 @@
                               <ref role="cht4Q" to="i2y7:2Vizpn2Mx$z" resolve="PlainTextFragment" />
                             </node>
                             <node concept="37vLTw" id="2NUzdxFlmJO" role="1m5AlR">
-                              <ref role="3cqZAo" node="2NUzdxFlmJW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1I9" resolve="it" />
                             </node>
                           </node>
                           <node concept="3TrcHB" id="2NUzdxFlmJP" role="2OqNvi">
@@ -4033,7 +4033,7 @@
                     </node>
                     <node concept="2OqwBi" id="2NUzdxFlmJS" role="3uHU7B">
                       <node concept="37vLTw" id="2NUzdxFlmJT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2NUzdxFlmJW" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1I9" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="2NUzdxFlmJU" role="2OqNvi">
                         <node concept="chp4Y" id="2NUzdxFlmJV" role="cj9EA">
@@ -4044,9 +4044,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="2NUzdxFlmJW" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1I9" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="2NUzdxFlmJX" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1Ia" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -4104,7 +4104,7 @@
                               <ref role="cht4Q" to="i2y7:2Vizpn2Mx$z" resolve="PlainTextFragment" />
                             </node>
                             <node concept="37vLTw" id="2NUzdxFln$q" role="1m5AlR">
-                              <ref role="3cqZAo" node="2NUzdxFln$y" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ib" resolve="it" />
                             </node>
                           </node>
                           <node concept="3TrcHB" id="2NUzdxFln$r" role="2OqNvi">
@@ -4117,7 +4117,7 @@
                     </node>
                     <node concept="2OqwBi" id="2NUzdxFln$u" role="3uHU7B">
                       <node concept="37vLTw" id="2NUzdxFln$v" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2NUzdxFln$y" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Ib" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="2NUzdxFln$w" role="2OqNvi">
                         <node concept="chp4Y" id="2NUzdxFln$x" role="cj9EA">
@@ -4128,9 +4128,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="2NUzdxFln$y" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1Ib" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="2NUzdxFln$z" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1Ic" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl
index e9f6e2a40ab..42f42ec736a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="9" />
         <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -52,7 +52,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -74,7 +73,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -97,7 +96,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -165,7 +164,6 @@
     <module reference="f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl
index dc75be328a5..7b7c684a169 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl
@@ -71,7 +71,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -141,7 +141,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_together">
@@ -189,7 +188,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -210,7 +208,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -237,7 +235,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -307,7 +305,6 @@
     <module reference="f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)" version="0" />
     <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/com/mbeddr/core/modules/gen/generator/main/util.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/com/mbeddr/core/modules/gen/generator/main/util.mps
index 4bd92db661a..5cf80c82a55 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/com/mbeddr/core/modules/gen/generator/main/util.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/com/mbeddr/core/modules/gen/generator/main/util.mps
@@ -44,7 +44,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -151,7 +151,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -177,7 +177,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -193,6 +193,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -252,7 +253,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -300,7 +301,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -392,7 +392,7 @@
                       <node concept="3clFbF" id="6QawkaJdN6a" role="3cqZAp">
                         <node concept="2OqwBi" id="6QawkaJdN6b" role="3clFbG">
                           <node concept="37vLTw" id="6QawkaJdN6c" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6QawkaJdN6e" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Jt" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6QawkaJdN6d" role="2OqNvi">
                             <ref role="3TsBF5" to="clbe:6QawkaIMrjd" resolve="transparent" />
@@ -400,9 +400,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6QawkaJdN6e" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Jt" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6QawkaJdN6f" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ju" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -468,7 +468,7 @@
                               <node concept="1PxgMI" id="6QawkaJedug" role="2Oq$k0">
                                 <node concept="2OqwBi" id="6QawkaJeczx" role="1m5AlR">
                                   <node concept="37vLTw" id="6QawkaJecnE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6QawkaJecfL" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Jv" resolve="it" />
                                   </node>
                                   <node concept="1mfA1w" id="6QawkaJedb2" role="2OqNvi" />
                                 </node>
@@ -490,9 +490,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6QawkaJecfL" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Jv" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6QawkaJecfM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Jw" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -557,7 +557,7 @@
                                 <node concept="1PxgMI" id="6QawkaKzXQd" role="2Oq$k0">
                                   <node concept="2OqwBi" id="6QawkaKzXQe" role="1m5AlR">
                                     <node concept="37vLTw" id="6QawkaKzXQf" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6QawkaKzXQl" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Jx" resolve="it" />
                                     </node>
                                     <node concept="1mfA1w" id="6QawkaKzXQg" role="2OqNvi" />
                                   </node>
@@ -590,7 +590,7 @@
                                     <node concept="1PxgMI" id="6QawkaKzZ4T" role="2Oq$k0">
                                       <node concept="2OqwBi" id="6QawkaKzZ4U" role="1m5AlR">
                                         <node concept="37vLTw" id="6QawkaKzZ4V" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6QawkaKzXQl" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Jx" resolve="it" />
                                         </node>
                                         <node concept="1mfA1w" id="6QawkaKzZ4W" role="2OqNvi" />
                                       </node>
@@ -621,9 +621,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6QawkaKzXQl" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Jx" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6QawkaKzXQm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Jy" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1379,7 +1379,7 @@
                       </node>
                       <node concept="2OqwBi" id="6QawkaJSDHy" role="37vLTJ">
                         <node concept="37vLTw" id="6QawkaJSDAx" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QawkaJSD_e" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Jz" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6QawkaJSEi6" role="2OqNvi">
                           <ref role="3TsBF5" to="clbe:6QawkaIMrjd" resolve="transparent" />
@@ -1388,9 +1388,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6QawkaJSD_e" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Jz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6QawkaJSD_f" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1J$" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps
index 631dedf1222..a15ddffedfa 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps
@@ -140,7 +140,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -186,7 +186,7 @@
       <concept id="5485104033529954230" name="com.mbeddr.core.statements.structure.ArbitraryTextAttributePrefix" flags="ng" index="3IwBUS">
         <property id="5485104033529954231" name="text" index="3IwBUT" />
       </concept>
-      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ng" index="3O7dYF">
+      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ngI" index="3O7dYF">
         <child id="605413736672002881" name="prefixes" index="3O7dZk" />
       </concept>
       <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf">
@@ -232,7 +232,7 @@
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
@@ -244,7 +244,7 @@
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
-      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ng" index="30XT8A">
+      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ngI" index="30XT8A">
         <property id="3265704088513289864" name="comment" index="34cw8o" />
       </concept>
       <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
@@ -296,7 +296,7 @@
       <concept id="1195502151594" name="jetbrains.mps.lang.generator.structure.MappingScriptReference" flags="lg" index="1puMqW">
         <reference id="1195502167610" name="mappingScript" index="1puQsG" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ngI" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
@@ -321,6 +321,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -388,10 +389,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -402,12 +403,12 @@
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
         <child id="4185783222026475860" name="body" index="3XIRFX" />
       </concept>
-      <concept id="1317894735999378711" name="com.mbeddr.core.modules.structure.IModuleContentContainer" flags="ng" index="2OOVXg">
+      <concept id="1317894735999378711" name="com.mbeddr.core.modules.structure.IModuleContentContainer" flags="ngI" index="2OOVXg">
         <property id="8758138335591593700" name="moduleNamePrefix" index="2r8tUd" />
         <child id="8514926279434977394" name="mangledNameFinalizer" index="StPw$" />
       </concept>
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -556,7 +557,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -582,7 +583,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -630,7 +631,6 @@
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -2345,7 +2345,7 @@
                           <node concept="3fqX7Q" id="6TPUpoFmzZx" role="3clFbG">
                             <node concept="2OqwBi" id="6TPUpoFmzZy" role="3fr31v">
                               <node concept="37vLTw" id="6TPUpoFmzZz" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6TPUpoFmzZA" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1J_" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6TPUpoFmzZ$" role="2OqNvi">
                                 <node concept="chp4Y" id="6TPUpoFmzZ_" role="cj9EA">
@@ -2356,9 +2356,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6TPUpoFmzZA" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1J_" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6TPUpoFmzZB" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1JA" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2375,7 +2375,7 @@
                               <node concept="22lmx$" id="4OlFaNL4V9D" role="1eOMHV">
                                 <node concept="2OqwBi" id="4OlFaNL4V9E" role="3uHU7w">
                                   <node concept="37vLTw" id="1IMNmPOxuLA" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3ilck8KrEIm" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1JB" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="4OlFaNL4V9G" role="2OqNvi">
                                     <node concept="chp4Y" id="4OlFaNL4V9H" role="cj9EA">
@@ -2385,7 +2385,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4OlFaNL4V9I" role="3uHU7B">
                                   <node concept="37vLTw" id="1IMNmPOxunX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3ilck8KrEIm" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1JB" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="4OlFaNL4V9K" role="2OqNvi">
                                     <node concept="chp4Y" id="2Lu1Jfl3xQu" role="cj9EA">
@@ -2405,7 +2405,7 @@
                           </node>
                           <node concept="2OqwBi" id="7jSUHHvja6b" role="3uHU7w">
                             <node concept="37vLTw" id="1IMNmPOxv$S" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ilck8KrEIm" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1JB" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4UbnhBEWPGw" role="2OqNvi">
                               <ref role="37wK5l" to="qd6m:6rD2$2sc8kI" resolve="isHeaderFileContent" />
@@ -2414,9 +2414,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ilck8KrEIm" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JB" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ilck8KrEIn" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JC" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2451,7 +2451,7 @@
                               <ref role="cht4Q" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
                             </node>
                             <node concept="37vLTw" id="1H6zsul6JrA" role="1m5AlR">
-                              <ref role="3cqZAo" node="1H6zsul6IzD" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1JD" resolve="it" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="4UbnhBFehmY" role="2OqNvi">
@@ -2460,9 +2460,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1H6zsul6IzD" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JD" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1H6zsul6IzE" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2541,7 +2541,7 @@
                       <node concept="3clFbF" id="3zugmcFFrX2" role="3cqZAp">
                         <node concept="2OqwBi" id="3zugmcFFrX8" role="3clFbG">
                           <node concept="37vLTw" id="1IMNmPOxwn7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3zugmcFFrXb" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1JF" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4UbnhBEWUDx" role="2OqNvi">
                             <ref role="37wK5l" to="qd6m:6rD2$2sc8kI" resolve="isHeaderFileContent" />
@@ -2549,9 +2549,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3zugmcFFrXb" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JF" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3zugmcFFrXc" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JG" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3221,7 +3221,7 @@
                           <node concept="3fqX7Q" id="3rj5gbxlZVR" role="3clFbG">
                             <node concept="2OqwBi" id="3rj5gbxlZVS" role="3fr31v">
                               <node concept="37vLTw" id="3rj5gbxlZVT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3rj5gbxlZVW" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1JH" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="3rj5gbxlZVU" role="2OqNvi">
                                 <node concept="chp4Y" id="3rj5gbxlZVV" role="cj9EA">
@@ -3232,9 +3232,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3rj5gbxlZVW" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1JH" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3rj5gbxlZVX" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1JI" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3257,7 +3257,7 @@
                               <node concept="22lmx$" id="3rj5gbxlZW6" role="1eOMHV">
                                 <node concept="2OqwBi" id="3rj5gbxlZW7" role="3uHU7w">
                                   <node concept="37vLTw" id="3rj5gbxlZW8" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3rj5gbxlZWv" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1JJ" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="3rj5gbxlZW9" role="2OqNvi">
                                     <node concept="chp4Y" id="3rj5gbxlZWa" role="cj9EA">
@@ -3267,7 +3267,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="3rj5gbxlZWb" role="3uHU7B">
                                   <node concept="37vLTw" id="3rj5gbxlZWc" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3rj5gbxlZWv" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1JJ" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="3rj5gbxlZWd" role="2OqNvi">
                                     <node concept="chp4Y" id="3rj5gbxlZWe" role="cj9EA">
@@ -3287,7 +3287,7 @@
                           </node>
                           <node concept="2OqwBi" id="3rj5gbxlZWs" role="3uHU7w">
                             <node concept="37vLTw" id="3rj5gbxlZWt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3rj5gbxlZWv" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1JJ" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4UbnhBEGw53" role="2OqNvi">
                               <ref role="37wK5l" to="qd6m:6rD2$2sc8kI" resolve="isHeaderFileContent" />
@@ -3296,9 +3296,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3rj5gbxlZWv" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3rj5gbxlZWw" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3354,7 +3354,7 @@
                               <ref role="cht4Q" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
                             </node>
                             <node concept="37vLTw" id="3rj5gbxlZWR" role="1m5AlR">
-                              <ref role="3cqZAo" node="3rj5gbxlZWT" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1JL" resolve="it" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="4UbnhBEGxsW" role="2OqNvi">
@@ -3363,9 +3363,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3rj5gbxlZWT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3rj5gbxlZWU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3481,7 +3481,7 @@
                       <node concept="3clFbF" id="3rj5gbxlZXx" role="3cqZAp">
                         <node concept="2OqwBi" id="3rj5gbxlZXy" role="3clFbG">
                           <node concept="37vLTw" id="3rj5gbxlZXz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3rj5gbxlZX_" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1JN" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4UbnhBEI0r8" role="2OqNvi">
                             <ref role="37wK5l" to="qd6m:6rD2$2sc8kI" resolve="isHeaderFileContent" />
@@ -3489,9 +3489,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3rj5gbxlZX_" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JN" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3rj5gbxlZXA" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JO" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3754,15 +3754,15 @@
                       <node concept="3clFbF" id="6hM2_xVYODS" role="3cqZAp">
                         <node concept="2OqwBi" id="6hM2_xVYOG2" role="3clFbG">
                           <node concept="37vLTw" id="6hM2_xVYODR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hM2_xVYOBi" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1JP" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="6hM2_xVYP05" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6hM2_xVYOBi" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6hM2_xVYOBj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3816,7 +3816,7 @@
                             <node concept="2OqwBi" id="59Urx6GCkPx" role="2Oq$k0">
                               <node concept="2JrnkZ" id="59Urx6GCkPy" role="2Oq$k0">
                                 <node concept="37vLTw" id="1IMNmPOxbrU" role="2JrQYb">
-                                  <ref role="3cqZAo" node="59Urx6GCkPC" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1JR" resolve="it" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="59Urx6GCkP$" role="2OqNvi">
@@ -3836,9 +3836,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="59Urx6GCkPC" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1JR" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="59Urx6GCkPD" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1JS" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3914,7 +3914,7 @@
                           <node concept="2OqwBi" id="2ZHlC003fsM" role="2Oq$k0">
                             <node concept="2JrnkZ" id="2ZHlC003fp2" role="2Oq$k0">
                               <node concept="37vLTw" id="2ZHlC003fdB" role="2JrQYb">
-                                <ref role="3cqZAo" node="2ZHlC003evT" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1JT" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="2ZHlC003fRd" role="2OqNvi">
@@ -3934,9 +3934,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2ZHlC003evT" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1JT" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2ZHlC003evU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1JU" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4015,7 +4015,7 @@
                           <node concept="2OqwBi" id="7WXwKLpF0Fa" role="2Oq$k0">
                             <node concept="2JrnkZ" id="7WXwKLpF0Fb" role="2Oq$k0">
                               <node concept="37vLTw" id="1IMNmPOxbvK" role="2JrQYb">
-                                <ref role="3cqZAo" node="7WXwKLpF0Fh" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1JV" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="7WXwKLpF0Fd" role="2OqNvi">
@@ -4035,9 +4035,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7WXwKLpF0Fh" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1JV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7WXwKLpF0Fi" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1JW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4168,7 +4168,7 @@
                                     <node concept="3clFbF" id="3juJO4ZGkvT" role="3cqZAp">
                                       <node concept="2OqwBi" id="3juJO4ZGkvU" role="3clFbG">
                                         <node concept="37vLTw" id="3juJO4ZGkvV" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3juJO4ZGkvX" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1JX" resolve="it" />
                                         </node>
                                         <node concept="3Tsc0h" id="3juJO4ZGkvW" role="2OqNvi">
                                           <ref role="3TtcxE" to="x27k:19a6$uAA8hU" resolve="imports" />
@@ -4176,9 +4176,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3juJO4ZGkvX" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1JX" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3juJO4ZGkvY" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1JY" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -4195,7 +4195,7 @@
                                 <node concept="3clFbF" id="3juJO4ZGkw4" role="3cqZAp">
                                   <node concept="2OqwBi" id="3juJO4ZGkw5" role="3clFbG">
                                     <node concept="37vLTw" id="3juJO4ZGkw6" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3juJO4ZGkw8" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1JZ" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="3juJO4ZGkw7" role="2OqNvi">
                                       <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -4203,9 +4203,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3juJO4ZGkw8" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1JZ" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3juJO4ZGkw9" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1K0" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4224,7 +4224,7 @@
                                 <node concept="2OqwBi" id="3juJO4ZGkwh" role="3uHU7w">
                                   <node concept="2OqwBi" id="3juJO4ZGkwi" role="2Oq$k0">
                                     <node concept="37vLTw" id="3juJO4ZGkwj" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3juJO4ZGkws" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1K1" resolve="it" />
                                     </node>
                                     <node concept="3CFZ6_" id="3juJO4ZGkwk" role="2OqNvi">
                                       <node concept="3CFYIy" id="3juJO4ZGkwl" role="3CFYIz">
@@ -4237,7 +4237,7 @@
                                 <node concept="3y3z36" id="3juJO4ZGkwn" role="3uHU7B">
                                   <node concept="2OqwBi" id="3juJO4ZGkwo" role="3uHU7B">
                                     <node concept="37vLTw" id="3juJO4ZGkwp" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3juJO4ZGkws" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1K1" resolve="it" />
                                     </node>
                                     <node concept="I4A8Y" id="3juJO4ZGkwq" role="2OqNvi" />
                                   </node>
@@ -4246,9 +4246,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3juJO4ZGkws" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1K1" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3juJO4ZGkwt" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1K2" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4316,15 +4316,15 @@
                                     <ref role="37wK5l" to="e2v8:3RdDJSz0eEv" resolve="shouldKeepAlive" />
                                     <ref role="1Pybhc" to="e2v8:2qmAZgXFmp_" resolve="GeneratorUtil" />
                                     <node concept="37vLTw" id="3RdDJSz0hoO" role="37wK5m">
-                                      <ref role="3cqZAo" node="36EXhjbTUX0" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1K3" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="36EXhjbTUX0" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1K3" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="36EXhjbTUX1" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1K4" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -4335,15 +4335,15 @@
                             <node concept="3clFbF" id="7UUkaBfeXQ1" role="3cqZAp">
                               <node concept="2OqwBi" id="7UUkaBfeXQ2" role="3clFbG">
                                 <node concept="37vLTw" id="7UUkaBfeXQ3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7UUkaBfeXQ5" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1K5" resolve="it" />
                                 </node>
                                 <node concept="3YRAZt" id="7UUkaBfeXQ4" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7UUkaBfeXQ5" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1K5" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7UUkaBfeXQ6" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1K6" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4388,7 +4388,7 @@
                     <node concept="3fqX7Q" id="26GfhzLdUOk" role="3clFbG">
                       <node concept="2OqwBi" id="26GfhzLdUOm" role="3fr31v">
                         <node concept="37vLTw" id="26GfhzLdUOn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="26GfhzLdQlo" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1K7" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="26GfhzLdUOo" role="2OqNvi">
                           <node concept="chp4Y" id="26GfhzLdUOp" role="cj9EA">
@@ -4399,9 +4399,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="26GfhzLdQlo" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1K7" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="26GfhzLdQlp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1K8" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4444,7 +4444,7 @@
                         <node concept="3clFbF" id="94IdDJG$3e" role="3cqZAp">
                           <node concept="2OqwBi" id="94IdDJG$3f" role="3clFbG">
                             <node concept="37vLTw" id="94IdDJG$3g" role="2Oq$k0">
-                              <ref role="3cqZAo" node="94IdDJG$3i" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1K9" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="94IdDJG$3h" role="2OqNvi">
                               <ref role="37wK5l" to="ahli:94IdDJEylB" resolve="isModuleInvolvedInCylce" />
@@ -4452,9 +4452,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="94IdDJG$3i" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1K9" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="94IdDJG$3j" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ka" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4496,7 +4496,7 @@
                           <node concept="3clFbF" id="94IdDKfYUo" role="3cqZAp">
                             <node concept="2OqwBi" id="94IdDKfYUq" role="3clFbG">
                               <node concept="37vLTw" id="94IdDKfYUr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="94IdDKfYUv" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Kb" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="94IdDKfYUs" role="2OqNvi">
                                 <ref role="37wK5l" to="ahli:94IdDJEITW" resolve="collectMissingDependencies" />
@@ -4510,9 +4510,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="94IdDKfYUv" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Kb" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="94IdDKfYUw" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Kc" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4590,15 +4590,15 @@
                                   <ref role="37wK5l" to="e2v8:3RdDJSz0eEv" resolve="shouldKeepAlive" />
                                   <ref role="1Pybhc" to="e2v8:2qmAZgXFmp_" resolve="GeneratorUtil" />
                                   <node concept="37vLTw" id="3RdDJSz0hll" role="37wK5m">
-                                    <ref role="3cqZAo" node="36EXhjbU0l$" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Kd" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="36EXhjbU0l$" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Kd" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="36EXhjbU0l_" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Ke" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4610,14 +4610,14 @@
                             <node concept="2OqwBi" id="54wV1sdxOM$" role="3clFbG">
                               <node concept="3YRAZt" id="1IMNmPOxcvZ" role="2OqNvi" />
                               <node concept="37vLTw" id="1IMNmPOxbFc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="54wV1sdxOMB" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Kf" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="54wV1sdxOMB" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Kf" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="54wV1sdxOMC" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Kg" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4806,7 +4806,7 @@
                                 <node concept="3fqX7Q" id="1lWQE5Evmfd" role="3clFbG">
                                   <node concept="2OqwBi" id="1lWQE5Evmz8" role="3fr31v">
                                     <node concept="37vLTw" id="1lWQE5Evml1" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1lWQE5Evm8k" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Kh" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="1lWQE5Evn5B" role="2OqNvi">
                                       <node concept="chp4Y" id="1lWQE5Evnec" role="cj9EA">
@@ -4817,9 +4817,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1lWQE5Evm8k" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Kh" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1lWQE5Evm8l" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Ki" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -4830,7 +4830,7 @@
                             <node concept="3clFbF" id="1lWQE5Evo3n" role="3cqZAp">
                               <node concept="2OqwBi" id="1lWQE5EvonC" role="3clFbG">
                                 <node concept="37vLTw" id="1lWQE5Evo3m" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1lWQE5EvnXl" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Kj" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="1lWQE5Evp0c" role="2OqNvi">
                                   <ref role="37wK5l" to="ahli:3BbcpZJ16uV" resolve="allReferencedModules" />
@@ -4838,9 +4838,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1lWQE5EvnXl" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Kj" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1lWQE5EvnXm" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Kk" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4853,7 +4853,7 @@
                               <node concept="3y3z36" id="1lWQE5E$Sbx" role="3uHU7B">
                                 <node concept="2OqwBi" id="1lWQE5EvBRu" role="3uHU7B">
                                   <node concept="37vLTw" id="1lWQE5EvAvq" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1lWQE5Ev_2W" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Kl" resolve="it" />
                                   </node>
                                   <node concept="I4A8Y" id="1lWQE5EvDgF" role="2OqNvi" />
                                 </node>
@@ -4862,7 +4862,7 @@
                               <node concept="2OqwBi" id="1lWQE5EvX8S" role="3uHU7w">
                                 <node concept="2OqwBi" id="1lWQE5EvTfa" role="2Oq$k0">
                                   <node concept="37vLTw" id="1lWQE5EvSKV" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1lWQE5Ev_2W" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Kl" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="1lWQE5EvUyJ" role="2OqNvi">
                                     <node concept="3CFYIy" id="1lWQE5EvVsk" role="3CFYIz">
@@ -4875,9 +4875,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1lWQE5Ev_2W" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Kl" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1lWQE5Ev_2X" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Km" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4942,14 +4942,14 @@
                                 <ref role="37wK5l" to="e2v8:3RdDJSz0eEv" resolve="shouldKeepAlive" />
                                 <ref role="1Pybhc" to="e2v8:2qmAZgXFmp_" resolve="GeneratorUtil" />
                                 <node concept="37vLTw" id="3RdDJSz0kjD" role="37wK5m">
-                                  <ref role="3cqZAo" node="3RdDJSz0jVP" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Kn" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3RdDJSz0jVP" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Kn" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3RdDJSz0jVQ" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Ko" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4978,7 +4978,7 @@
                           <node concept="3fqX7Q" id="26GfhzLe3vw" role="3clFbG">
                             <node concept="2OqwBi" id="26GfhzLe3BR" role="3fr31v">
                               <node concept="37vLTw" id="26GfhzLe3xt" role="2Oq$k0">
-                                <ref role="3cqZAo" node="26GfhzLe3s_" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Kp" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="26GfhzLe4ft" role="2OqNvi">
                                 <node concept="chp4Y" id="26GfhzLe4jJ" role="cj9EA">
@@ -4989,9 +4989,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="26GfhzLe3s_" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Kp" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="26GfhzLe3sA" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Kq" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5050,7 +5050,7 @@
                                           <node concept="2OqwBi" id="3RsvcbxGSRO" role="3fr31v">
                                             <node concept="2OqwBi" id="3RsvcbxGSRP" role="2Oq$k0">
                                               <node concept="37vLTw" id="3RsvcbxGSRQ" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3RsvcbxGPoH" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1Kr" resolve="it" />
                                               </node>
                                               <node concept="2qgKlT" id="3RsvcbxGSRR" role="2OqNvi">
                                                 <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -5063,9 +5063,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3RsvcbxGPoH" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1Kr" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="3RsvcbxGPoI" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1Ks" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -5076,7 +5076,7 @@
                                     <node concept="3clFbF" id="3RsvcbxOtR3" role="3cqZAp">
                                       <node concept="2OqwBi" id="3RsvcbxOu8U" role="3clFbG">
                                         <node concept="37vLTw" id="3RsvcbxOtR2" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3RsvcbxOtpT" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Kt" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="3RsvcbxOw3$" role="2OqNvi">
                                           <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -5084,9 +5084,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3RsvcbxOtpT" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1Kt" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3RsvcbxOtpU" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1Ku" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -5176,7 +5176,7 @@
                           <node concept="3clFbF" id="3_DQCSSLAcP" role="3cqZAp">
                             <node concept="2OqwBi" id="3_DQCSSLAcQ" role="3clFbG">
                               <node concept="37vLTw" id="3_DQCSSLAcR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3_DQCSSLAcU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Kv" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="3_DQCSSLAcS" role="2OqNvi">
                                 <node concept="chp4Y" id="3_DQCSSLAcT" role="cj9EA">
@@ -5186,9 +5186,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3_DQCSSLAcU" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Kv" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3_DQCSSLAcV" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Kw" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5205,7 +5205,7 @@
                               <node concept="2OqwBi" id="3_DQCSSLAd0" role="25WWJ7">
                                 <node concept="1PxgMI" id="3_DQCSSLAd1" role="2Oq$k0">
                                   <node concept="37vLTw" id="3_DQCSSLAd2" role="1m5AlR">
-                                    <ref role="3cqZAo" node="3_DQCSSLAd6" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Kx" resolve="it" />
                                   </node>
                                   <node concept="chp4Y" id="1SbcsM$Fuzi" role="3oSUPX">
                                     <ref role="cht4Q" to="vs0r:7P$_wJpwSfc" resolve="IConfigurationItemWithImport" />
@@ -5222,9 +5222,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3_DQCSSLAd6" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Kx" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3_DQCSSLAd7" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ky" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5385,15 +5385,15 @@
                       <node concept="3clFbF" id="3_DQCSSKWnP" role="3cqZAp">
                         <node concept="2OqwBi" id="3_DQCSSKWob" role="3clFbG">
                           <node concept="37vLTw" id="3_DQCSSKWnQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3_DQCSSKWnN" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Kz" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="3_DQCSSKWog" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3_DQCSSKWnN" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Kz" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3_DQCSSKWnO" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1K$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5486,7 +5486,7 @@
                       <node concept="TSZUe" id="2bm5KFZB6ET" role="2OqNvi">
                         <node concept="2OqwBi" id="2bm5KFZB6Fg" role="25WWJ7">
                           <node concept="37vLTw" id="1IMNmPOxc$g" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2bm5KFZB6DY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1K_" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="4yCyDr3jzpe" role="2OqNvi" />
                         </node>
@@ -5494,9 +5494,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2bm5KFZB6DY" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1K_" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2bm5KFZB6DZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1KA" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5658,7 +5658,7 @@
                             <node concept="3clFbF" id="2bm5KFZB6HT" role="3cqZAp">
                               <node concept="2OqwBi" id="2bm5KFZB6HU" role="3clFbG">
                                 <node concept="37vLTw" id="1IMNmPOxcEX" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2bm5KFZB6HZ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1KB" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="2bm5KFZB6HW" role="2OqNvi">
                                   <node concept="25Kdxt" id="2bm5KFZB6HX" role="cj9EA">
@@ -5673,9 +5673,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2bm5KFZB6HZ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1KB" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2bm5KFZB6I0" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1KC" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -5757,15 +5757,15 @@
                                 <node concept="3clFbF" id="2bm5KFZB6Ik" role="3cqZAp">
                                   <node concept="2OqwBi" id="2bm5KFZB6Il" role="3clFbG">
                                     <node concept="37vLTw" id="1IMNmPOxcMj" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2bm5KFZB6Io" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1KD" resolve="it" />
                                     </node>
                                     <node concept="3YRAZt" id="2bm5KFZB6In" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2bm5KFZB6Io" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1KD" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2bm5KFZB6Ip" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1KE" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -5840,7 +5840,7 @@
                               <node concept="2OqwBi" id="5oU3_tOEY_F" role="3clFbG">
                                 <node concept="2OqwBi" id="5oU3_tOEYd5" role="2Oq$k0">
                                   <node concept="37vLTw" id="5oU3_tOEYd6" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4g_6LpiL1zP" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1KH" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="5oU3_tOEYd7" role="2OqNvi" />
                                 </node>
@@ -5850,7 +5850,7 @@
                                       <node concept="3clFbF" id="5oU3_tOF04G" role="3cqZAp">
                                         <node concept="2OqwBi" id="5oU3_tOF0d$" role="3clFbG">
                                           <node concept="37vLTw" id="5oU3_tOF04F" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5oU3_tOEZkw" resolve="desc" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1KF" resolve="desc" />
                                           </node>
                                           <node concept="1mIQ4w" id="5oU3_tOF0lb" role="2OqNvi">
                                             <node concept="25Kdxt" id="5oU3_tOF0tw" role="cj9EA">
@@ -5865,18 +5865,18 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="5oU3_tOEZkw" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1KF" role="1bW2Oz">
                                       <property role="TrG5h" value="desc" />
-                                      <node concept="2jxLKc" id="5oU3_tOEZkx" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1KG" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4g_6LpiL1zP" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1KH" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4g_6LpiL1zQ" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1KI" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -5958,15 +5958,15 @@
                                 <node concept="3clFbF" id="4g_6LpiL1$r" role="3cqZAp">
                                   <node concept="2OqwBi" id="4g_6LpiL1$s" role="3clFbG">
                                     <node concept="37vLTw" id="1IMNmPOxcMx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4g_6LpiL1$v" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1KJ" resolve="it" />
                                     </node>
                                     <node concept="3YRAZt" id="4g_6LpiL1$u" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4g_6LpiL1$v" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1KJ" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4g_6LpiL1$w" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1KK" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -6227,15 +6227,15 @@
                           <node concept="3clFbF" id="30ZiFaB3pYn" role="3cqZAp">
                             <node concept="2OqwBi" id="30ZiFaB3rNr" role="3clFbG">
                               <node concept="37vLTw" id="30ZiFaB3pYm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="30ZiFaB3phg" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1KL" resolve="it" />
                               </node>
                               <node concept="1$rogu" id="30ZiFaB3uqa" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="30ZiFaB3phg" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1KL" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="30ZiFaB3phh" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1KM" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6422,7 +6422,7 @@
                     <node concept="3clFbF" id="1ye7yATR8bz" role="3cqZAp">
                       <node concept="2OqwBi" id="1ye7yATR8jK" role="3clFbG">
                         <node concept="37vLTw" id="1ye7yATR8by" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1ye7yATR7UF" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1KN" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="1ye7yATR93B" role="2OqNvi">
                           <node concept="1xMEDy" id="1ye7yATR93D" role="1xVPHs">
@@ -6435,9 +6435,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1ye7yATR7UF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1KN" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1ye7yATR7UG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1KO" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6448,7 +6448,7 @@
                   <node concept="3clFbF" id="1H6zsumb3NQ" role="3cqZAp">
                     <node concept="2OqwBi" id="1H6zsumbDhH" role="3clFbG">
                       <node concept="37vLTw" id="1H6zsumbQ65" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1H6zsumb3KN" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1KP" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="1H6zsumbNcX" role="2OqNvi">
                         <node concept="2OqwBi" id="1H6zsumcY4S" role="1P9ThW">
@@ -6457,7 +6457,7 @@
                               <ref role="cht4Q" to="yq40:4VhroexOKM1" resolve="ArrayType" />
                             </node>
                             <node concept="37vLTw" id="1H6zsumccK8" role="1m5AlR">
-                              <ref role="3cqZAo" node="1H6zsumb3KN" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1KP" resolve="it" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="1H6zsumd1ZQ" role="2OqNvi">
@@ -6468,9 +6468,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1H6zsumb3KN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1KP" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1H6zsumb3KO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1KQ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6503,7 +6503,7 @@
                       <node concept="2OqwBi" id="7RHXOmxr9mp" role="3clFbG">
                         <node concept="2OqwBi" id="7RHXOmxr7rM" role="2Oq$k0">
                           <node concept="37vLTw" id="7RHXOmxr7jO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7RHXOmxr72F" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1KR" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7RHXOmxr8GI" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:7RHXOmw3XK4" resolve="headerToImport" />
@@ -6513,9 +6513,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7RHXOmxr72F" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1KR" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7RHXOmxr72G" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1KS" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6531,7 +6531,7 @@
                       </node>
                       <node concept="2OqwBi" id="fWgwtoY_tH" role="33vP2m">
                         <node concept="37vLTw" id="fWgwtoY_tI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7RHXOmw7W$I" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1KT" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="fWgwtoY_tJ" role="2OqNvi">
                           <node concept="1xMEDy" id="fWgwtoY_tK" role="1xVPHs">
@@ -6554,7 +6554,7 @@
                             <ref role="37wK5l" to="qd6m:4GT16cGfDI2" resolve="addUniqueStdHeaderImport" />
                             <node concept="2OqwBi" id="7RHXOmw844S" role="37wK5m">
                               <node concept="37vLTw" id="7RHXOmw83Z3" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7RHXOmw7W$I" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1KT" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="7RHXOmw85j0" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:7RHXOmw3XK4" resolve="headerToImport" />
@@ -6563,7 +6563,7 @@
                             <node concept="3fqX7Q" id="7RHXOmyHaYP" role="37wK5m">
                               <node concept="2OqwBi" id="7RHXOmyHaYR" role="3fr31v">
                                 <node concept="37vLTw" id="7RHXOmyHaYS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7RHXOmw7W$I" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1KT" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="7RHXOmyHaYT" role="2OqNvi">
                                   <ref role="37wK5l" to="hwgx:7RHXOmw7Mgm" resolve="onlyForImplementation" />
@@ -6572,7 +6572,7 @@
                             </node>
                             <node concept="2OqwBi" id="3LB9aGl8$Zg" role="37wK5m">
                               <node concept="37vLTw" id="3LB9aGl8$uA" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7RHXOmw7W$I" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1KT" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="3LB9aGl8G8W" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:3LB9aGl8_PP" resolve="preprocessorCondition" />
@@ -6580,7 +6580,7 @@
                             </node>
                             <node concept="2OqwBi" id="1m$ejqCnEm4" role="37wK5m">
                               <node concept="37vLTw" id="1m$ejqCnE96" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7RHXOmw7W$I" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1KT" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="1m$ejqCnLXi" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:1m$ejqCnFa4" resolve="alternativeHeaderToImport" />
@@ -6598,9 +6598,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7RHXOmw7W$I" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1KT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7RHXOmw7W$J" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1KU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6633,7 +6633,7 @@
                       <node concept="2OqwBi" id="6uc_WDSaVa6" role="3clFbG">
                         <node concept="2OqwBi" id="6uc_WDSaSQ4" role="2Oq$k0">
                           <node concept="37vLTw" id="6uc_WDSaSCi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6uc_WDSaSkd" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1KV" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="6uc_WDSaUl0" role="2OqNvi">
                             <node concept="1xMEDy" id="6uc_WDSaUl2" role="1xVPHs">
@@ -6647,9 +6647,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6uc_WDSaSkd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1KV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6uc_WDSaSke" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1KW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6682,11 +6682,11 @@
                               <node concept="3clFbF" id="4bSv2xZggOR" role="3cqZAp">
                                 <node concept="3clFbC" id="4bSv2xZggOS" role="3clFbG">
                                   <node concept="37vLTw" id="4bSv2xZggOT" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                                   </node>
                                   <node concept="2OqwBi" id="4bSv2xZggOU" role="3uHU7B">
                                     <node concept="37vLTw" id="4bSv2xZggOV" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4bSv2xZggOX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1KX" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4bSv2xZggOW" role="2OqNvi">
                                       <ref role="3Tt5mk" to="clbe:5yYXyc4Z0CT" resolve="struct" />
@@ -6695,9 +6695,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4bSv2xZggOX" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1KX" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4bSv2xZggOY" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1KY" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -6719,7 +6719,7 @@
                             <node concept="WxPPo" id="27yO7ubzfUC" role="28ntcv">
                               <node concept="2OqwBi" id="4bSv2xZgpJU" role="WxPPp">
                                 <node concept="37vLTw" id="4bSv2xZgpJV" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                                 </node>
                                 <node concept="3TrcHB" id="4bSv2xZgpJW" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -6736,7 +6736,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4bSv2xZgpJY" role="3uHU7B">
                                   <node concept="37vLTw" id="4bSv2xZgpJZ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                                   </node>
                                   <node concept="3TrcHB" id="4bSv2xZgpK0" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6750,7 +6750,7 @@
                             <node concept="WxPPo" id="27yO7ubzfUE" role="28ntcv">
                               <node concept="2OqwBi" id="4bSv2xZgpK2" role="WxPPp">
                                 <node concept="37vLTw" id="4bSv2xZgpK3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                                 </node>
                                 <node concept="3TrcHB" id="4bSv2xZgpK4" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:5Oog2UbP_d2" resolve="preventNameMangling" />
@@ -6766,7 +6766,7 @@
                                 <ref role="2pIpSl" to="clbe:5yYXyc4Z0CT" resolve="struct" />
                                 <node concept="36biLy" id="4bSv2xZgpK8" role="28nt2d">
                                   <node concept="37vLTw" id="4bSv2xZgpK9" role="36biLW">
-                                    <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                                   </node>
                                 </node>
                               </node>
@@ -6779,7 +6779,7 @@
                   <node concept="3clFbF" id="4bSv2xZfH_B" role="3cqZAp">
                     <node concept="2OqwBi" id="4bSv2xZfHGE" role="3clFbG">
                       <node concept="37vLTw" id="4bSv2xZfH_A" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                        <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                       </node>
                       <node concept="HtI8k" id="6xgYZvaqKHa" role="2OqNvi">
                         <node concept="37vLTw" id="6xgYZvaqLcC" role="HtI8F">
@@ -6792,7 +6792,7 @@
                     <node concept="37vLTI" id="4bSv2xZfV2k" role="3clFbG">
                       <node concept="2OqwBi" id="4bSv2xZfYeg" role="37vLTx">
                         <node concept="37vLTw" id="4bSv2xZfXYS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                          <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                         </node>
                         <node concept="3TrcHB" id="4bSv2xZfZAN" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6800,7 +6800,7 @@
                       </node>
                       <node concept="2OqwBi" id="4bSv2xZfSVM" role="37vLTJ">
                         <node concept="37vLTw" id="4bSv2xZfSO1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4bSv2xZfHym" resolve="structDecl" />
+                          <ref role="3cqZAo" node="2SR9xrsN1L1" resolve="structDecl" />
                         </node>
                         <node concept="3TrcHB" id="4bSv2xZfUew" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6820,7 +6820,7 @@
                             <node concept="3clFbF" id="4bSv2xZgmD6" role="3cqZAp">
                               <node concept="2OqwBi" id="4bSv2xZgmQ6" role="3clFbG">
                                 <node concept="37vLTw" id="4bSv2xZgmD5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4bSv2xZgmeW" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1KZ" resolve="it" />
                                 </node>
                                 <node concept="1P9Npp" id="4bSv2xZgosY" role="2OqNvi">
                                   <node concept="2pJPEk" id="4bSv2xZgoSa" role="1P9ThW">
@@ -6839,7 +6839,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfUF" role="28ntcv">
                                           <node concept="2OqwBi" id="7MZet6E9pKw" role="WxPPp">
                                             <node concept="37vLTw" id="7MZet6E9pyV" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4bSv2xZgmeW" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1KZ" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="7MZet6E9rIF" role="2OqNvi">
                                               <ref role="3TsBF5" to="mj1l:2zhwXA$N7QC" resolve="const" />
@@ -6852,7 +6852,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfUG" role="28ntcv">
                                           <node concept="2OqwBi" id="7MZet6E9tal" role="WxPPp">
                                             <node concept="37vLTw" id="7MZet6E9sWF" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4bSv2xZgmeW" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1KZ" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="7MZet6E9uyM" role="2OqNvi">
                                               <ref role="3TsBF5" to="mj1l:2zhwXA$YI0J" resolve="volatile" />
@@ -6866,9 +6866,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4bSv2xZgmeW" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1KZ" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4bSv2xZgmeX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1L0" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -6877,9 +6877,9 @@
                   <node concept="3clFbH" id="4bSv2xZg26j" role="3cqZAp" />
                   <node concept="3clFbH" id="4bSv2xZg26W" role="3cqZAp" />
                 </node>
-                <node concept="Rh6nW" id="4bSv2xZfHym" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1L1" role="1bW2Oz">
                   <property role="TrG5h" value="structDecl" />
-                  <node concept="2jxLKc" id="4bSv2xZfHyn" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1L2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6904,7 +6904,7 @@
                       <node concept="2OqwBi" id="6uc_WDSb7pw" role="3clFbG">
                         <node concept="2OqwBi" id="6uc_WDSb56k" role="2Oq$k0">
                           <node concept="37vLTw" id="6uc_WDSb4Sy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6uc_WDSb4$J" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1L3" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="6uc_WDSb6$Y" role="2OqNvi">
                             <node concept="1xMEDy" id="6uc_WDSb6_0" role="1xVPHs">
@@ -6918,9 +6918,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6uc_WDSb4$J" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1L3" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6uc_WDSb4$K" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1L4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6952,11 +6952,11 @@
                               <node concept="3clFbF" id="4bSv2xZguDo" role="3cqZAp">
                                 <node concept="3clFbC" id="4bSv2xZguDp" role="3clFbG">
                                   <node concept="37vLTw" id="4bSv2xZgyIz" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                                   </node>
                                   <node concept="2OqwBi" id="4bSv2xZguDr" role="3uHU7B">
                                     <node concept="37vLTw" id="4bSv2xZguDs" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4bSv2xZguDu" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1L5" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4bSv2xZgwmR" role="2OqNvi">
                                       <ref role="3Tt5mk" to="clbe:56ytRgsLog7" resolve="union" />
@@ -6965,9 +6965,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4bSv2xZguDu" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1L5" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4bSv2xZguDv" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1L6" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -6990,7 +6990,7 @@
                             <node concept="WxPPo" id="27yO7ubzfUH" role="28ntcv">
                               <node concept="2OqwBi" id="4bSv2xZgz7K" role="WxPPp">
                                 <node concept="37vLTw" id="4bSv2xZgz7L" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                                 </node>
                                 <node concept="3TrcHB" id="4bSv2xZgz7M" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -7007,7 +7007,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4bSv2xZgz7O" role="3uHU7B">
                                   <node concept="37vLTw" id="4bSv2xZgz7P" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                                   </node>
                                   <node concept="3TrcHB" id="4bSv2xZgz7Q" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7021,7 +7021,7 @@
                             <node concept="WxPPo" id="27yO7ubzfUJ" role="28ntcv">
                               <node concept="2OqwBi" id="4bSv2xZgz7S" role="WxPPp">
                                 <node concept="37vLTw" id="4bSv2xZgz7T" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                                 </node>
                                 <node concept="3TrcHB" id="4bSv2xZgz7U" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:5Oog2UbP_d2" resolve="preventNameMangling" />
@@ -7037,7 +7037,7 @@
                                 <ref role="2pIpSl" to="clbe:56ytRgsLog7" resolve="union" />
                                 <node concept="36biLy" id="4bSv2xZgz7Y" role="28nt2d">
                                   <node concept="37vLTw" id="4bSv2xZgz7Z" role="36biLW">
-                                    <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                                   </node>
                                 </node>
                               </node>
@@ -7050,7 +7050,7 @@
                   <node concept="3clFbF" id="4bSv2xZfPQ5" role="3cqZAp">
                     <node concept="2OqwBi" id="4bSv2xZfPQ6" role="3clFbG">
                       <node concept="37vLTw" id="4bSv2xZfPQ7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                        <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                       </node>
                       <node concept="HtI8k" id="6xgYZvaqMcy" role="2OqNvi">
                         <node concept="37vLTw" id="6xgYZvaqN2A" role="HtI8F">
@@ -7063,7 +7063,7 @@
                     <node concept="37vLTI" id="4bSv2xZg11D" role="3clFbG">
                       <node concept="2OqwBi" id="4bSv2xZg11F" role="37vLTx">
                         <node concept="37vLTw" id="4bSv2xZg11G" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                          <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                         </node>
                         <node concept="3TrcHB" id="4bSv2xZg11H" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7071,7 +7071,7 @@
                       </node>
                       <node concept="2OqwBi" id="4bSv2xZg11N" role="37vLTJ">
                         <node concept="37vLTw" id="4bSv2xZg11O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4bSv2xZfPQo" resolve="unionDecl" />
+                          <ref role="3cqZAo" node="2SR9xrsN1L9" resolve="unionDecl" />
                         </node>
                         <node concept="3TrcHB" id="4bSv2xZg11P" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7091,7 +7091,7 @@
                             <node concept="3clFbF" id="4bSv2xZg_Gf" role="3cqZAp">
                               <node concept="2OqwBi" id="4bSv2xZg_Gg" role="3clFbG">
                                 <node concept="37vLTw" id="4bSv2xZg_Gh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4bSv2xZg_Go" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1L7" resolve="it" />
                                 </node>
                                 <node concept="1P9Npp" id="4bSv2xZg_Gi" role="2OqNvi">
                                   <node concept="2pJPEk" id="4bSv2xZg_Gj" role="1P9ThW">
@@ -7110,7 +7110,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfUK" role="28ntcv">
                                           <node concept="2OqwBi" id="7MZet6E9vaX" role="WxPPp">
                                             <node concept="37vLTw" id="7MZet6E9vaY" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4bSv2xZg_Go" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1L7" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="7MZet6E9vaZ" role="2OqNvi">
                                               <ref role="3TsBF5" to="mj1l:2zhwXA$N7QC" resolve="const" />
@@ -7123,7 +7123,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfUL" role="28ntcv">
                                           <node concept="2OqwBi" id="7MZet6E9vb1" role="WxPPp">
                                             <node concept="37vLTw" id="7MZet6E9vb2" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4bSv2xZg_Go" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1L7" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="7MZet6E9vb3" role="2OqNvi">
                                               <ref role="3TsBF5" to="mj1l:2zhwXA$YI0J" resolve="volatile" />
@@ -7137,9 +7137,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4bSv2xZg_Go" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1L7" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4bSv2xZg_Gp" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1L8" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7147,9 +7147,9 @@
                   </node>
                   <node concept="3clFbH" id="4bSv2xZg_t3" role="3cqZAp" />
                 </node>
-                <node concept="Rh6nW" id="4bSv2xZfPQo" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1L9" role="1bW2Oz">
                   <property role="TrG5h" value="unionDecl" />
-                  <node concept="2jxLKc" id="4bSv2xZfPQp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1La" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7174,7 +7174,7 @@
                       <node concept="2OqwBi" id="6towh06aHn$" role="3clFbG">
                         <node concept="2OqwBi" id="6towh06aHn_" role="2Oq$k0">
                           <node concept="37vLTw" id="6towh06aHnA" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6towh06aHnF" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Lb" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="6towh06aHnB" role="2OqNvi">
                             <node concept="1xMEDy" id="6towh06aHnC" role="1xVPHs">
@@ -7188,9 +7188,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6towh06aHnF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Lb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6towh06aHnG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Lc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7222,11 +7222,11 @@
                               <node concept="3clFbF" id="6towh06aHnW" role="3cqZAp">
                                 <node concept="3clFbC" id="6towh06aHnX" role="3clFbG">
                                   <node concept="37vLTw" id="6towh06aHnY" role="3uHU7w">
-                                    <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                                   </node>
                                   <node concept="2OqwBi" id="6towh06aHnZ" role="3uHU7B">
                                     <node concept="37vLTw" id="6towh06aHo0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6towh06aHo2" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ld" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="6towh06aZT1" role="2OqNvi">
                                       <ref role="3Tt5mk" to="clbe:7D99css6O16" resolve="enum" />
@@ -7235,9 +7235,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6towh06aHo2" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Ld" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6towh06aHo3" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Le" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -7260,7 +7260,7 @@
                             <node concept="WxPPo" id="27yO7ubzfUM" role="28ntcv">
                               <node concept="2OqwBi" id="6towh06aHoc" role="WxPPp">
                                 <node concept="37vLTw" id="6towh06aHod" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                                 </node>
                                 <node concept="3TrcHB" id="6towh06aHoe" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -7277,7 +7277,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6towh06aHoi" role="3uHU7B">
                                   <node concept="37vLTw" id="6towh06aHoj" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                                   </node>
                                   <node concept="3TrcHB" id="6towh06aHok" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7291,7 +7291,7 @@
                             <node concept="WxPPo" id="27yO7ubzfUO" role="28ntcv">
                               <node concept="2OqwBi" id="6towh06aHom" role="WxPPp">
                                 <node concept="37vLTw" id="6towh06aHon" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                                 </node>
                                 <node concept="3TrcHB" id="6towh06aHoo" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:5Oog2UbP_d2" resolve="preventNameMangling" />
@@ -7307,7 +7307,7 @@
                                 <ref role="2pIpSl" to="clbe:7D99css6O16" resolve="enum" />
                                 <node concept="36biLy" id="6towh06aHos" role="28nt2d">
                                   <node concept="37vLTw" id="6towh06aHot" role="36biLW">
-                                    <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                                   </node>
                                 </node>
                               </node>
@@ -7325,7 +7325,7 @@
                         </node>
                       </node>
                       <node concept="37vLTw" id="6towh06aHow" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                       </node>
                     </node>
                   </node>
@@ -7333,7 +7333,7 @@
                     <node concept="37vLTI" id="6towh06aHo$" role="3clFbG">
                       <node concept="2OqwBi" id="6towh06aHo_" role="37vLTx">
                         <node concept="37vLTw" id="6towh06aHoA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                         </node>
                         <node concept="3TrcHB" id="6towh06aHoB" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7341,7 +7341,7 @@
                       </node>
                       <node concept="2OqwBi" id="6towh06aHoC" role="37vLTJ">
                         <node concept="37vLTw" id="6towh06aHoD" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6towh06aHp6" resolve="enumDecl" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Lh" resolve="enumDecl" />
                         </node>
                         <node concept="3TrcHB" id="6towh06aHoE" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7361,7 +7361,7 @@
                             <node concept="3clFbF" id="6towh06aHoM" role="3cqZAp">
                               <node concept="2OqwBi" id="6towh06aHoN" role="3clFbG">
                                 <node concept="37vLTw" id="6towh06aHoO" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6towh06aHp3" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Lf" resolve="it" />
                                 </node>
                                 <node concept="1P9Npp" id="6towh06aHoP" role="2OqNvi">
                                   <node concept="2pJPEk" id="6towh06aHoQ" role="1P9ThW">
@@ -7380,7 +7380,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfUP" role="28ntcv">
                                           <node concept="2OqwBi" id="6towh06aHoW" role="WxPPp">
                                             <node concept="37vLTw" id="6towh06aHoX" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6towh06aHp3" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Lf" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="6towh06aHoY" role="2OqNvi">
                                               <ref role="3TsBF5" to="mj1l:2zhwXA$N7QC" resolve="const" />
@@ -7393,7 +7393,7 @@
                                         <node concept="WxPPo" id="27yO7ubzfUQ" role="28ntcv">
                                           <node concept="2OqwBi" id="6towh06aHp0" role="WxPPp">
                                             <node concept="37vLTw" id="6towh06aHp1" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6towh06aHp3" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Lf" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="6towh06aHp2" role="2OqNvi">
                                               <ref role="3TsBF5" to="mj1l:2zhwXA$YI0J" resolve="volatile" />
@@ -7407,9 +7407,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6towh06aHp3" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Lf" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6towh06aHp4" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Lg" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7417,9 +7417,9 @@
                   </node>
                   <node concept="3clFbH" id="6towh06aHp5" role="3cqZAp" />
                 </node>
-                <node concept="Rh6nW" id="6towh06aHp6" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Lh" role="1bW2Oz">
                   <property role="TrG5h" value="enumDecl" />
-                  <node concept="2jxLKc" id="6towh06aHp7" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Li" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7470,7 +7470,7 @@
                             <node concept="3fqX7Q" id="SHi2zrzwfB" role="3uHU7B">
                               <node concept="2OqwBi" id="SHi2zrzwfD" role="3fr31v">
                                 <node concept="37vLTw" id="SHi2zrzwfE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1teBndx4Ino" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Lj" resolve="it" />
                                 </node>
                                 <node concept="1BlSNk" id="SHi2zrzwfF" role="2OqNvi">
                                   <ref role="1BmUXE" to="x27k:5_l8w1EmTvx" resolve="Function" />
@@ -7482,7 +7482,7 @@
                               <node concept="10Nm6u" id="1teBndx4Inj" role="3uHU7w" />
                               <node concept="2OqwBi" id="1teBndx4Ink" role="3uHU7B">
                                 <node concept="37vLTw" id="1IMNmPOx3KA" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1teBndx4Ino" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Lj" resolve="it" />
                                 </node>
                                 <node concept="3CFZ6_" id="1teBndx4Inm" role="2OqNvi">
                                   <node concept="3CFYIy" id="1teBndx4Inn" role="3CFYIz">
@@ -7494,9 +7494,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1teBndx4Ino" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Lj" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1teBndx4Inp" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Lk" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -7777,7 +7777,7 @@
                           <node concept="3clFbT" id="4LNwMvnB6rt" role="37vLTx" />
                           <node concept="2OqwBi" id="6zBbPFB21Mc" role="37vLTJ">
                             <node concept="37vLTw" id="6zBbPFB21lW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1rZqEK2LJli" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ll" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="4LNwMvnfO5A" role="2OqNvi">
                               <ref role="3TsBF5" to="c4fa:41KMvfcgiZ1" resolve="isInvisible" />
@@ -7786,9 +7786,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1rZqEK2LJli" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ll" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1rZqEK2LJlj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Lm" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8037,15 +8037,15 @@
                                       <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
                                     </node>
                                     <node concept="37vLTw" id="5qJgyBh9y5i" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5qJgyBh9y5j" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Ln" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5qJgyBh9y5j" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Ln" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5qJgyBh9y5k" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Lo" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -8209,15 +8209,15 @@
                                       <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
                                     </node>
                                     <node concept="37vLTw" id="5qJgyBh9sVd" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5tbhN$68QbQ" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Lp" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5tbhN$68QbQ" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Lp" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5tbhN$68QbR" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Lq" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -8270,7 +8270,7 @@
                         <node concept="2OqwBi" id="5tbhN$4NtVq" role="3clFbG">
                           <node concept="2OqwBi" id="5tbhN$4NrBL" role="2Oq$k0">
                             <node concept="37vLTw" id="5tbhN$4Nruu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5tbhN$4Nrri" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Lr" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5tbhN$4Ntfm" role="2OqNvi">
                               <ref role="3Tt5mk" to="c4fa:6iIoqg1xKT0" resolve="iterator" />
@@ -8280,9 +8280,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5tbhN$4Nrri" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Lr" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5tbhN$4Nrrj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ls" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8908,7 +8908,7 @@
                         <node concept="2OqwBi" id="5qJgyBhcPm5" role="3clFbG">
                           <node concept="2OqwBi" id="5qJgyBhcN5$" role="2Oq$k0">
                             <node concept="37vLTw" id="5qJgyBhcMY3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5qJgyBhcMLw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Lt" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5qJgyBhcO4X" role="2OqNvi">
                               <ref role="3Tt5mk" to="yq40:1gDNXlE1$cN" resolve="sizeExpr" />
@@ -8918,9 +8918,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5qJgyBhcMLw" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Lt" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5qJgyBhcMLx" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Lu" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8984,7 +8984,7 @@
                           <node concept="2OqwBi" id="1mwQ_7z_jql" role="3uHU7B">
                             <node concept="2OqwBi" id="1mwQ_7z_gSE" role="2Oq$k0">
                               <node concept="37vLTw" id="1mwQ_7z_gLU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1mwQ_7z_gLI" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Lv" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="1mwQ_7z_hiN" role="2OqNvi">
                                 <ref role="3TtcxE" to="c4fa:7FkLcyyQKyy" resolve="elements" />
@@ -8995,9 +8995,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1mwQ_7z_gLI" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Lv" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1mwQ_7z_gLJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Lw" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -9020,7 +9020,7 @@
                     <node concept="2OqwBi" id="5tbhN$5Ur7d" role="3clFbG">
                       <node concept="2OqwBi" id="5tbhN$5Uquu" role="2Oq$k0">
                         <node concept="37vLTw" id="5tbhN$5UqnC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5tbhN$5UqkR" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Lx" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="5tbhN$5UqW5" role="2OqNvi">
                           <node concept="3CFYIy" id="5tbhN$5Ur0r" role="3CFYIz">
@@ -9032,9 +9032,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5tbhN$5UqkR" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Lx" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5tbhN$5UqkS" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ly" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9147,7 +9147,7 @@
                           </node>
                           <node concept="2OqwBi" id="3mNkkAiMfmO" role="37vLTJ">
                             <node concept="37vLTw" id="3mNkkAiMfmP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3mNkkAiMfn0" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Lz" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3mNkkAiMfmQ" role="2OqNvi">
                               <ref role="3Tt5mk" to="x27k:7oF65pen41M" resolve="mangledNameFinalizer" />
@@ -9156,9 +9156,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3mNkkAiMfn0" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Lz" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3mNkkAiMfn1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1L$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -9295,7 +9295,7 @@
                     <node concept="2OqwBi" id="34XNuWnDxbE" role="3clFbG">
                       <node concept="2OqwBi" id="34XNuWnD9xQ" role="2Oq$k0">
                         <node concept="37vLTw" id="34XNuWnD4ym" role="2Oq$k0">
-                          <ref role="3cqZAo" node="34XNuWnCUFV" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1L_" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="34XNuWnDi6O" role="2OqNvi">
                           <node concept="3CFYIy" id="34XNuWnDraG" role="3CFYIz">
@@ -9307,9 +9307,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="34XNuWnCUFV" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1L_" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="34XNuWnCUFW" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1LA" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9425,7 +9425,7 @@
                     <node concept="2OqwBi" id="34XNuWnDQ7k" role="3clFbG">
                       <node concept="2OqwBi" id="34XNuWnDQ7l" role="2Oq$k0">
                         <node concept="37vLTw" id="34XNuWnDQ7m" role="2Oq$k0">
-                          <ref role="3cqZAo" node="34XNuWnDQ7q" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1LB" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="34XNuWnDQ7n" role="2OqNvi">
                           <node concept="3CFYIy" id="34XNuWnDQ7o" role="3CFYIz">
@@ -9437,9 +9437,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="34XNuWnDQ7q" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1LB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="34XNuWnDQ7r" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1LC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9678,15 +9678,15 @@
                   <node concept="3clFbF" id="2aQczEaUl_y" role="3cqZAp">
                     <node concept="2OqwBi" id="2aQczEaUlDH" role="3clFbG">
                       <node concept="37vLTw" id="2aQczEaUl_x" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2aQczEaUlzw" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1LD" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="2aQczEaUlT0" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2aQczEaUlzw" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1LD" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2aQczEaUlzx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1LE" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9894,7 +9894,7 @@
                           <node concept="3fqX7Q" id="6TPUpoF8$s0" role="3clFbG">
                             <node concept="2OqwBi" id="6TPUpoF8_l2" role="3fr31v">
                               <node concept="37vLTw" id="6TPUpoF8$Sl" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6TPUpoF8z9f" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1LF" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6TPUpoF8_TE" role="2OqNvi">
                                 <node concept="chp4Y" id="6TPUpoF8A1Q" role="cj9EA">
@@ -9905,9 +9905,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6TPUpoF8z9f" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1LF" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6TPUpoF8z9g" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1LG" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -9921,7 +9921,7 @@
                           <node concept="10P_77" id="10qKQykNDl3" role="1tU5fm" />
                           <node concept="2OqwBi" id="10qKQykNDl4" role="33vP2m">
                             <node concept="37vLTw" id="1IMNmPOxi1o" role="2Oq$k0">
-                              <ref role="3cqZAo" node="10qKQykNDl$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1LH" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="10qKQykNDl6" role="2OqNvi">
                               <node concept="chp4Y" id="10qKQykNDl7" role="cj9EA">
@@ -9937,7 +9937,7 @@
                           <node concept="10P_77" id="10qKQykNDla" role="1tU5fm" />
                           <node concept="2OqwBi" id="10qKQykNDlb" role="33vP2m">
                             <node concept="37vLTw" id="1IMNmPOxirl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="10qKQykNDl$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1LH" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="10qKQykNDld" role="2OqNvi">
                               <node concept="chp4Y" id="10qKQykNDle" role="cj9EA">
@@ -9953,7 +9953,7 @@
                           <node concept="10P_77" id="10qKQykNDlh" role="1tU5fm" />
                           <node concept="2OqwBi" id="10qKQykNDli" role="33vP2m">
                             <node concept="37vLTw" id="1IMNmPOxiPi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="10qKQykNDl$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1LH" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="10qKQykNDlk" role="2OqNvi">
                               <node concept="chp4Y" id="10qKQykNDll" role="cj9EA">
@@ -9986,7 +9986,7 @@
                           </node>
                           <node concept="2OqwBi" id="10qKQykNDlp" role="3uHU7w">
                             <node concept="37vLTw" id="1IMNmPOxjff" role="2Oq$k0">
-                              <ref role="3cqZAo" node="10qKQykNDl$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1LH" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4UbnhBEYu3D" role="2OqNvi">
                               <ref role="37wK5l" to="qd6m:6rD2$2sc6_0" resolve="isSourceFileContent" />
@@ -9995,9 +9995,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="10qKQykNDl$" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1LH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="10qKQykNDl_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1LI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10025,7 +10025,7 @@
                             <node concept="3fqX7Q" id="10qKQykNDmd" role="3uHU7w">
                               <node concept="2OqwBi" id="10qKQykNDme" role="3fr31v">
                                 <node concept="37vLTw" id="1IMNmPOxkiR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="10qKQykNDmm" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1LJ" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4UbnhBFfBmB" role="2OqNvi">
                                   <ref role="37wK5l" to="qd6m:6rD2$2sc8kI" resolve="isHeaderFileContent" />
@@ -10034,7 +10034,7 @@
                             </node>
                             <node concept="2OqwBi" id="10qKQykNDm9" role="3uHU7B">
                               <node concept="37vLTw" id="1IMNmPOxjDi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="10qKQykNDmm" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1LJ" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="10qKQykNDmb" role="2OqNvi">
                                 <node concept="chp4Y" id="10qKQykNDmc" role="cj9EA">
@@ -10047,7 +10047,7 @@
                             <node concept="2OqwBi" id="4UbnhBFf9Cm" role="3fr31v">
                               <node concept="1PxgMI" id="4UbnhBFf9Cn" role="2Oq$k0">
                                 <node concept="37vLTw" id="4UbnhBFf9Co" role="1m5AlR">
-                                  <ref role="3cqZAo" node="10qKQykNDmm" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1LJ" resolve="it" />
                                 </node>
                                 <node concept="chp4Y" id="4UbnhBFf9Cp" role="3oSUPX">
                                   <ref role="cht4Q" to="x27k:5_l8w1EmTvx" resolve="Function" />
@@ -10061,9 +10061,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="10qKQykNDmm" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1LJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="10qKQykNDmn" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1LK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10117,7 +10117,7 @@
                             <node concept="1Wc70l" id="4sIWb0AhL0D" role="1eOMHV">
                               <node concept="2OqwBi" id="4sIWb0AhL0E" role="3uHU7w">
                                 <node concept="37vLTw" id="4sIWb0AhL0F" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4sIWb0AheOE" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1LL" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4sIWb0AhL0G" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:5Oog2UbPmsL" resolve="extern" />
@@ -10125,7 +10125,7 @@
                               </node>
                               <node concept="2OqwBi" id="4sIWb0AhL0H" role="3uHU7B">
                                 <node concept="37vLTw" id="4sIWb0AhL0I" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4sIWb0AheOE" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1LL" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4UbnhBEZTRz" role="2OqNvi">
                                   <ref role="37wK5l" to="qd6m:6rD2$2sc8kI" resolve="isHeaderFileContent" />
@@ -10136,9 +10136,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4sIWb0AheOE" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1LL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4sIWb0AheOF" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1LM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/behavior.mps
index 8aa4b731fe2..4bfba457295 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/behavior.mps
@@ -145,7 +145,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -169,7 +169,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -189,6 +189,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -262,7 +263,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -299,7 +300,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -989,7 +989,7 @@
                           <node concept="3clFbF" id="6Dsu9vjKyk1" role="3cqZAp">
                             <node concept="2OqwBi" id="6Dsu9vjKyk2" role="3clFbG">
                               <node concept="37vLTw" id="6Dsu9vjKyk3" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Dsu9vjKyk7" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1IF" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6Dsu9vjKyk4" role="2OqNvi">
                                 <node concept="25Kdxt" id="6Dsu9vjKyk5" role="cj9EA">
@@ -1004,9 +1004,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6Dsu9vjKyk7" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1IF" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6Dsu9vjKyk8" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1IG" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1105,7 +1105,7 @@
                         <node concept="3clFbF" id="6Dsu9vjKyks" role="3cqZAp">
                           <node concept="2OqwBi" id="6Dsu9vjKykt" role="3clFbG">
                             <node concept="37vLTw" id="6Dsu9vjKyku" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Dsu9vjKykx" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1IH" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="6Dsu9vjKykv" role="2OqNvi">
                               <node concept="chp4Y" id="6Dsu9vjKykw" role="cj9EA">
@@ -1115,9 +1115,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Dsu9vjKykx" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1IH" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Dsu9vjKyky" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1II" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1129,7 +1129,7 @@
                         <node concept="2OqwBi" id="6Dsu9vjKykB" role="3clFbG">
                           <node concept="1PxgMI" id="6Dsu9vjKykC" role="2Oq$k0">
                             <node concept="37vLTw" id="6Dsu9vjKykD" role="1m5AlR">
-                              <ref role="3cqZAo" node="6Dsu9vjKykF" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1IJ" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="79i$vAY5QKr" role="3oSUPX">
                               <ref role="cht4Q" to="d0vh:19a6$uAAsGA" resolve="GenImplModuleImport" />
@@ -1141,9 +1141,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Dsu9vjKykF" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1IJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Dsu9vjKykG" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1IK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1192,7 +1192,7 @@
                         <node concept="3clFbF" id="3ihY0KieedU" role="3cqZAp">
                           <node concept="2OqwBi" id="3ihY0KieedV" role="3clFbG">
                             <node concept="37vLTw" id="3ihY0KieedW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ihY0KieedZ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1IL" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="3ihY0KieedX" role="2OqNvi">
                               <node concept="chp4Y" id="3ihY0Kieeew" role="cj9EA">
@@ -1202,9 +1202,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3ihY0KieedZ" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1IL" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3ihY0Kieee0" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1IM" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1216,7 +1216,7 @@
                         <node concept="2OqwBi" id="3ihY0Kieee5" role="3clFbG">
                           <node concept="1PxgMI" id="3ihY0Kieee6" role="2Oq$k0">
                             <node concept="37vLTw" id="3ihY0Kieee7" role="1m5AlR">
-                              <ref role="3cqZAo" node="3ihY0Kieee9" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1IN" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="79i$vAY5QKs" role="3oSUPX">
                               <ref role="cht4Q" to="d0vh:7RiewQ_laN_" resolve="GenExtModuleImport" />
@@ -1228,9 +1228,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ihY0Kieee9" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1IN" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ihY0Kieeea" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1IO" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1263,7 +1263,7 @@
                           <node concept="3clFbF" id="6Dsu9vjKykU" role="3cqZAp">
                             <node concept="2OqwBi" id="6Dsu9vjKykV" role="3clFbG">
                               <node concept="37vLTw" id="6Dsu9vjKykW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Dsu9vjKyl0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1IP" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6Dsu9vjKykX" role="2OqNvi">
                                 <node concept="25Kdxt" id="6Dsu9vjKykY" role="cj9EA">
@@ -1278,9 +1278,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6Dsu9vjKyl0" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1IP" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6Dsu9vjKyl1" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1IQ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1368,7 +1368,7 @@
                         <node concept="3clFbF" id="28AJuTuFOE5" role="3cqZAp">
                           <node concept="2OqwBi" id="28AJuTuFOE6" role="3clFbG">
                             <node concept="37vLTw" id="28AJuTuFOE7" role="2Oq$k0">
-                              <ref role="3cqZAo" node="28AJuTuFOEa" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1IR" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="28AJuTuFOE8" role="2OqNvi">
                               <node concept="chp4Y" id="28AJuTuFOE9" role="cj9EA">
@@ -1378,9 +1378,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="28AJuTuFOEa" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1IR" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="28AJuTuFOEb" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1IS" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1392,7 +1392,7 @@
                         <node concept="2OqwBi" id="28AJuTuFOEg" role="3clFbG">
                           <node concept="1PxgMI" id="28AJuTuFOEh" role="2Oq$k0">
                             <node concept="37vLTw" id="28AJuTuFOEi" role="1m5AlR">
-                              <ref role="3cqZAo" node="28AJuTuFOEk" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1IT" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="79i$vAY5QKu" role="3oSUPX">
                               <ref role="cht4Q" to="d0vh:19a6$uAAsGA" resolve="GenImplModuleImport" />
@@ -1404,9 +1404,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="28AJuTuFOEk" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1IT" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="28AJuTuFOEl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1IU" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1759,7 +1759,7 @@
                           <node concept="3clFbF" id="6Dsu9vjKE6V" role="3cqZAp">
                             <node concept="2OqwBi" id="6Dsu9vjKE6W" role="3clFbG">
                               <node concept="37vLTw" id="6Dsu9vjKE6X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Dsu9vjKE71" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1IV" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6Dsu9vjKE6Y" role="2OqNvi">
                                 <node concept="25Kdxt" id="6Dsu9vjKE6Z" role="cj9EA">
@@ -1774,9 +1774,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6Dsu9vjKE71" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1IV" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6Dsu9vjKE72" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1IW" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1850,7 +1850,7 @@
                         <node concept="3clFbF" id="6Dsu9vjKE7o" role="3cqZAp">
                           <node concept="2OqwBi" id="6Dsu9vjKE7p" role="3clFbG">
                             <node concept="37vLTw" id="6Dsu9vjKE7q" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Dsu9vjKE7t" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1IX" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="6Dsu9vjKE7r" role="2OqNvi">
                               <node concept="chp4Y" id="6Dsu9vjKE7s" role="cj9EA">
@@ -1860,9 +1860,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Dsu9vjKE7t" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1IX" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Dsu9vjKE7u" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1IY" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1873,7 +1873,7 @@
                       <node concept="3clFbF" id="6Dsu9vjKE7y" role="3cqZAp">
                         <node concept="1PxgMI" id="6Dsu9vjKE7z" role="3clFbG">
                           <node concept="37vLTw" id="6Dsu9vjKE7$" role="1m5AlR">
-                            <ref role="3cqZAo" node="6Dsu9vjKE7_" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1IZ" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="79i$vAY5QKv" role="3oSUPX">
                             <ref role="cht4Q" to="d0vh:19a6$uAAsGA" resolve="GenImplModuleImport" />
@@ -1881,9 +1881,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Dsu9vjKE7_" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1IZ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Dsu9vjKE7A" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1J0" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1932,7 +1932,7 @@
                         <node concept="3clFbF" id="3ihY0KieeAD" role="3cqZAp">
                           <node concept="2OqwBi" id="3ihY0KieeAE" role="3clFbG">
                             <node concept="37vLTw" id="3ihY0KieeAF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ihY0KieeAI" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1J1" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="3ihY0KieeAG" role="2OqNvi">
                               <node concept="chp4Y" id="3ihY0KieeAH" role="cj9EA">
@@ -1942,9 +1942,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3ihY0KieeAI" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1J1" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3ihY0KieeAJ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1J2" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1956,7 +1956,7 @@
                         <node concept="2OqwBi" id="3ihY0KieeAO" role="3clFbG">
                           <node concept="1PxgMI" id="3ihY0KieeAP" role="2Oq$k0">
                             <node concept="37vLTw" id="3ihY0KieeAQ" role="1m5AlR">
-                              <ref role="3cqZAo" node="3ihY0KieeAS" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1J3" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="79i$vAY5QKx" role="3oSUPX">
                               <ref role="cht4Q" to="d0vh:7RiewQ_laN_" resolve="GenExtModuleImport" />
@@ -1968,9 +1968,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ihY0KieeAS" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1J3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ihY0KieeAT" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1J4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2129,7 +2129,7 @@
                           <node concept="3clFbF" id="6Dsu9vjKE56" role="3cqZAp">
                             <node concept="2OqwBi" id="6Dsu9vjKE57" role="3clFbG">
                               <node concept="37vLTw" id="6Dsu9vjKE58" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Dsu9vjKE5c" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1J5" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6Dsu9vjKE59" role="2OqNvi">
                                 <node concept="25Kdxt" id="6Dsu9vjKE5a" role="cj9EA">
@@ -2144,9 +2144,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6Dsu9vjKE5c" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1J5" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6Dsu9vjKE5d" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1J6" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2391,7 +2391,7 @@
                           <node concept="3clFbF" id="6Dsu9vjKMby" role="3cqZAp">
                             <node concept="2OqwBi" id="6Dsu9vjKMbB" role="3clFbG">
                               <node concept="37vLTw" id="6Dsu9vjKMbC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Dsu9vjKMbG" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1J7" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6Dsu9vjKMbD" role="2OqNvi">
                                 <node concept="25Kdxt" id="6Dsu9vjKMbE" role="cj9EA">
@@ -2406,9 +2406,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6Dsu9vjKMbG" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1J7" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6Dsu9vjKMbH" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1J8" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2448,7 +2448,7 @@
                                 <node concept="1Wc70l" id="6Dsu9vjKMbZ" role="3clFbG">
                                   <node concept="2OqwBi" id="6Dsu9vjKMc0" role="3uHU7w">
                                     <node concept="37vLTw" id="6Dsu9vjKMc1" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6Dsu9vjKMc8" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1J9" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="6Dsu9vjKMc2" role="2OqNvi">
                                       <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -2456,7 +2456,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="6Dsu9vjKMc3" role="3uHU7B">
                                     <node concept="37vLTw" id="6Dsu9vjKMc4" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6Dsu9vjKMc8" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1J9" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="6Dsu9vjKMc5" role="2OqNvi">
                                       <node concept="25Kdxt" id="6Dsu9vjKMc6" role="cj9EA">
@@ -2472,9 +2472,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6Dsu9vjKMc8" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1J9" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6Dsu9vjKMc9" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Ja" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2499,7 +2499,7 @@
                         <node concept="3clFbF" id="6Dsu9vjKMci" role="3cqZAp">
                           <node concept="2OqwBi" id="6Dsu9vjKMcj" role="3clFbG">
                             <node concept="37vLTw" id="6Dsu9vjKMck" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Dsu9vjKMcn" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Jb" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="6Dsu9vjKMcl" role="2OqNvi">
                               <node concept="chp4Y" id="6Dsu9vjKMcm" role="cj9EA">
@@ -2509,9 +2509,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Dsu9vjKMcn" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Jb" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Dsu9vjKMco" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Jc" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2522,7 +2522,7 @@
                       <node concept="3clFbF" id="6Dsu9vjKMcs" role="3cqZAp">
                         <node concept="1PxgMI" id="6Dsu9vjKMct" role="3clFbG">
                           <node concept="37vLTw" id="6Dsu9vjKMcu" role="1m5AlR">
-                            <ref role="3cqZAo" node="6Dsu9vjKMcv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Jd" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="79i$vAY5QKt" role="3oSUPX">
                             <ref role="cht4Q" to="d0vh:7RiewQ_laN_" resolve="GenExtModuleImport" />
@@ -2530,9 +2530,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Dsu9vjKMcv" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Jd" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Dsu9vjKMcw" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Je" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2627,7 +2627,7 @@
                         <node concept="3clFbF" id="6Dsu9vjKMcQ" role="3cqZAp">
                           <node concept="2OqwBi" id="6Dsu9vjKMcR" role="3clFbG">
                             <node concept="37vLTw" id="6Dsu9vjKMcS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Dsu9vjKMcV" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Jf" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="6Dsu9vjKMcT" role="2OqNvi">
                               <node concept="chp4Y" id="6Dsu9vjKMcU" role="cj9EA">
@@ -2637,9 +2637,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Dsu9vjKMcV" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Jf" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Dsu9vjKMcW" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Jg" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2650,7 +2650,7 @@
                       <node concept="3clFbF" id="6Dsu9vjKMd0" role="3cqZAp">
                         <node concept="1PxgMI" id="6Dsu9vjKMd1" role="3clFbG">
                           <node concept="37vLTw" id="6Dsu9vjKMd2" role="1m5AlR">
-                            <ref role="3cqZAo" node="6Dsu9vjKMd3" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Jh" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="79i$vAY5QKw" role="3oSUPX">
                             <ref role="cht4Q" to="d0vh:19a6$uAAsGA" resolve="GenImplModuleImport" />
@@ -2658,9 +2658,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Dsu9vjKMd3" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Jh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Dsu9vjKMd4" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ji" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.enumMigration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.enumMigration.mps
index df7794f4287..6c7a80750ec 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.enumMigration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.plugin.mps
index 3fd93daa25b..0a75e5ab2e4 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/com.mbeddr.core.modules.gen.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -88,7 +88,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -122,6 +122,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -199,7 +200,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -216,7 +217,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
@@ -258,7 +258,7 @@
                                     <node concept="10QFUN" id="6TPUpoEegn5" role="3clFbG">
                                       <node concept="2OqwBi" id="6TPUpoEegn6" role="10QFUP">
                                         <node concept="37vLTw" id="6TPUpoEegn7" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6TPUpoEegna" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Jn" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="6TPUpoEegn8" role="2OqNvi">
                                           <ref role="37wK5l" to="tpcq:2Op6w9TzkM3" resolve="getModel" />
@@ -268,9 +268,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6TPUpoEegna" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1Jn" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6TPUpoEegnb" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1Jo" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -284,7 +284,7 @@
                                 <node concept="2OqwBi" id="7fn1GcKTrH9" role="3clFbG">
                                   <node concept="2OqwBi" id="7fn1GcKTbqg" role="2Oq$k0">
                                     <node concept="37vLTw" id="7fn1GcKTb5T" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7fn1GcKTahZ" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Jp" resolve="it" />
                                     </node>
                                     <node concept="2RRcyG" id="7fn1GcKTc0C" role="2OqNvi">
                                       <node concept="chp4Y" id="34w7WGUSF1a" role="3MHsoP">
@@ -296,9 +296,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7fn1GcKTahZ" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Jp" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7fn1GcKTai0" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Jq" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -364,7 +364,7 @@
                                       <node concept="2OqwBi" id="27KN8bxhXv9" role="2Oq$k0">
                                         <node concept="2OqwBi" id="27KN8bxhXva" role="2Oq$k0">
                                           <node concept="37vLTw" id="27KN8bxhXvb" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6TPUpoEegpo" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Jr" resolve="it" />
                                           </node>
                                           <node concept="3Tsc0h" id="27KN8bxhXvc" role="2OqNvi">
                                             <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
@@ -415,7 +415,7 @@
                                             <node concept="2OqwBi" id="27KN8bxhXvv" role="37wK5m">
                                               <node concept="2OqwBi" id="27KN8bxhXvw" role="2Oq$k0">
                                                 <node concept="37vLTw" id="27KN8bxhXvx" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6TPUpoEegpo" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Jr" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="27KN8bxhXvy" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="platform" />
@@ -511,9 +511,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6TPUpoEegpo" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Jr" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6TPUpoEegpp" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Js" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/constraints.mps
index 8e2124f85a3..b1005769523 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/constraints.mps
@@ -42,7 +42,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/editor.mps
index b52f3fe0efa..830796fc185 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/editor.mps
@@ -29,7 +29,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -80,7 +80,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -96,7 +96,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -119,7 +119,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -189,7 +189,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -251,7 +251,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/intentions.mps
index cce23b28868..0d36483c81d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/intentions.mps
@@ -64,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps
index 17648dc0f7e..3a0baf0cc4e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps
@@ -94,7 +94,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/textGen.mps
index a7ddf8c3895..83efeef7600 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/textGen.mps
@@ -65,7 +65,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -76,6 +76,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -139,7 +140,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -155,7 +156,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -472,7 +472,7 @@
                     <node concept="3fqX7Q" id="6rD2$2u9s7d" role="3clFbG">
                       <node concept="2OqwBi" id="6rD2$2u9s7f" role="3fr31v">
                         <node concept="37vLTw" id="6rD2$2u9s7g" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6rD2$2u9lve" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Jj" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="6rD2$2u9s7h" role="2OqNvi">
                           <node concept="chp4Y" id="6rD2$2u9TpT" role="cj9EA">
@@ -483,9 +483,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6rD2$2u9lve" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Jj" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6rD2$2u9lvf" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Jk" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -703,7 +703,7 @@
                     <node concept="3fqX7Q" id="6hbeR3KQXzh" role="3clFbG">
                       <node concept="2OqwBi" id="6hbeR3KQXzi" role="3fr31v">
                         <node concept="37vLTw" id="6hbeR3KQXzj" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hbeR3KQXzm" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Jl" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="6hbeR3KQXzk" role="2OqNvi">
                           <node concept="chp4Y" id="6hbeR3KQXzl" role="cj9EA">
@@ -714,9 +714,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6hbeR3KQXzm" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Jl" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6hbeR3KQXzn" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Jm" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/com.mbeddr.core.modules.generator.com.mbeddr.core.modules.util.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/com.mbeddr.core.modules.generator.com.mbeddr.core.modules.util.mps
index fc22d0f2d2d..714adcc342c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/com.mbeddr.core.modules.generator.com.mbeddr.core.modules.util.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/com.mbeddr.core.modules.generator.com.mbeddr.core.modules.util.mps
@@ -96,7 +96,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -109,7 +109,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -143,6 +143,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -191,7 +192,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -211,7 +212,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -806,7 +806,7 @@
                               <node concept="2OqwBi" id="4U0cQfK8CwV" role="2Oq$k0">
                                 <node concept="2OqwBi" id="4U0cQfK8zVs" role="2Oq$k0">
                                   <node concept="37vLTw" id="4U0cQfK8zDM" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4U0cQfK8z_q" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1P5" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="4U0cQfK8$ES" role="2OqNvi">
                                     <node concept="1xMEDy" id="4U0cQfK8$EU" role="1xVPHs">
@@ -826,9 +826,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4U0cQfK8z_q" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1P5" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4U0cQfK8z_r" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1P6" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps
index b781de4aa29..453b6863448 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps
@@ -113,7 +113,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -183,6 +183,7 @@
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1046929382682558545" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteralType" flags="ig" index="9cv3F" />
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
       </concept>
@@ -296,7 +297,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -323,7 +324,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225621920911" name="jetbrains.mps.baseLanguage.collections.structure.InsertElementOperation" flags="nn" index="1sK_Qi">
         <child id="1225621943565" name="element" index="1sKFgg" />
         <child id="1225621960341" name="index" index="1sKJu8" />
@@ -1054,7 +1054,7 @@
                         <node concept="2OqwBi" id="5_7aueB_FqK" role="3uHU7w">
                           <node concept="2OqwBi" id="5_7aueB_FqL" role="2Oq$k0">
                             <node concept="37vLTw" id="5_7aueB_FqM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5_7aueB$Vta" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1P7" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5_7aueBA0sE" role="2OqNvi">
                               <ref role="3Tt5mk" to="c4fa:3CmSUB7Fw7R" resolve="init" />
@@ -1076,7 +1076,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5_7aueB$Vt3" role="1m5AlR">
                                     <node concept="37vLTw" id="5_7aueB$Vt5" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5_7aueB$Vta" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1P7" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5_7aueBA099" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1096,7 +1096,7 @@
                             <node concept="2OqwBi" id="5_7aueB_YST" role="3uHU7B">
                               <node concept="2OqwBi" id="5_7aueB_VRE" role="2Oq$k0">
                                 <node concept="37vLTw" id="5_7aueB_TK1" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5_7aueB$Vta" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1P7" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5_7aueB_Y2t" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1116,7 +1116,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5_7aueDrKZL" role="1m5AlR">
                                     <node concept="37vLTw" id="5_7aueDrKZM" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5_7aueB$Vta" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1P7" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5_7aueDrKZN" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1134,9 +1134,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5_7aueB$Vta" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1P7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5_7aueB$Vtb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1P8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1382,7 +1382,7 @@
                         <node concept="2OqwBi" id="5_7aueEoGvs" role="3uHU7w">
                           <node concept="2OqwBi" id="5_7aueEoGvt" role="2Oq$k0">
                             <node concept="37vLTw" id="5_7aueEoGvu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5_7aueEoGvX" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1P9" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5_7aueEoGvv" role="2OqNvi">
                               <ref role="3Tt5mk" to="c4fa:3CmSUB7Fw7R" resolve="init" />
@@ -1404,7 +1404,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5_7aueEoGvC" role="1m5AlR">
                                     <node concept="37vLTw" id="5_7aueEoGvD" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5_7aueEoGvX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1P9" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5_7aueEoGvE" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1424,7 +1424,7 @@
                             <node concept="2OqwBi" id="5_7aueEoGvI" role="3uHU7B">
                               <node concept="2OqwBi" id="5_7aueEoGvJ" role="2Oq$k0">
                                 <node concept="37vLTw" id="5_7aueEoGvK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5_7aueEoGvX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1P9" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5_7aueEoGvL" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1444,7 +1444,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5_7aueEoGvS" role="1m5AlR">
                                     <node concept="37vLTw" id="5_7aueEoGvT" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5_7aueEoGvX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1P9" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5_7aueEoGvU" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1462,9 +1462,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5_7aueEoGvX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1P9" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5_7aueEoGvY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pa" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1698,7 +1698,7 @@
                               <ref role="37wK5l" to="lkz5:4LUDPiac$sG" resolve="typeOf" />
                               <node concept="2OqwBi" id="1ou7643ZjeQ" role="37wK5m">
                                 <node concept="37vLTw" id="1ou7643Zi_$" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3$tYugdXElr" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Pb" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1ou7643ZjXj" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
@@ -1715,7 +1715,7 @@
                         <node concept="2OqwBi" id="3$tYugdXEll" role="3uHU7w">
                           <node concept="2OqwBi" id="3$tYugdXElm" role="2Oq$k0">
                             <node concept="37vLTw" id="3$tYugdXEln" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3$tYugdXElr" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Pb" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3$tYugdXElo" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -1730,9 +1730,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3$tYugdXElr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3$tYugdXEls" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1985,7 +1985,7 @@
                       <node concept="2OqwBi" id="1ou7643T5sX" role="3clFbG">
                         <node concept="2OqwBi" id="1ou7643T5sY" role="2Oq$k0">
                           <node concept="37vLTw" id="1ou7643T5sZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1ou7643T5t3" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Pd" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="1ou7643T5t0" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -1999,9 +1999,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1ou7643T5t3" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pd" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1ou7643T5t4" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pe" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2761,7 +2761,7 @@
                                   <ref role="37wK5l" to="lkz5:4LUDPiac$sG" resolve="typeOf" />
                                   <node concept="2OqwBi" id="4W77tK$oW2U" role="37wK5m">
                                     <node concept="37vLTw" id="4W77tK$oW2V" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4U0cQfIZfAv" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Pf" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4W77tK$oW2W" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
@@ -2781,7 +2781,7 @@
                                   <ref role="37wK5l" to="lkz5:4LUDPiac$sG" resolve="typeOf" />
                                   <node concept="2OqwBi" id="4W77tK$oW30" role="37wK5m">
                                     <node concept="37vLTw" id="4W77tK$oW31" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4U0cQfIZfAv" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Pf" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4W77tK$oW32" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -2816,7 +2816,7 @@
                                         <ref role="37wK5l" to="lkz5:4LUDPiac$sG" resolve="typeOf" />
                                         <node concept="2OqwBi" id="4W77tK$oW3d" role="37wK5m">
                                           <node concept="37vLTw" id="4W77tK$oW3e" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4U0cQfIZfAv" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Pf" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4W77tK$oW3f" role="2OqNvi">
                                             <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -2832,7 +2832,7 @@
                                         <ref role="37wK5l" to="lkz5:4LUDPiac$sG" resolve="typeOf" />
                                         <node concept="2OqwBi" id="4W77tK$oW3i" role="37wK5m">
                                           <node concept="37vLTw" id="4W77tK$oW3j" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4U0cQfIZfAv" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Pf" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4W77tK$oW3k" role="2OqNvi">
                                             <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
@@ -2869,9 +2869,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4U0cQfIZfAv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Pf" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4U0cQfIZfAw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Pg" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps
index b030ed877ac..7feb11a8163 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps
@@ -79,7 +79,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -132,7 +132,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/actions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/actions.mps
index 85893c4f604..73b47cd124d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/actions.mps
@@ -88,7 +88,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/behavior.mps
index a28de3ec6b6..24f6f406fc9 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/behavior.mps
@@ -212,7 +212,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -248,7 +248,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -282,6 +282,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -416,7 +417,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -470,7 +471,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1116,7 +1116,7 @@
                       </node>
                       <node concept="2OqwBi" id="5CXUFNJF6GK" role="33vP2m">
                         <node concept="37vLTw" id="5CXUFNJF6GL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6clJcrKwcAC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1LP" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5CXUFNJF6GM" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -1152,9 +1152,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6clJcrKwcAC" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1LP" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6clJcrKwcAD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1LQ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1247,7 +1247,7 @@
                       </node>
                       <node concept="2OqwBi" id="4a$W5l2eaih" role="33vP2m">
                         <node concept="37vLTw" id="4a$W5l2eaii" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4a$W5l2eaiv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1LR" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="4a$W5l2eaij" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -1275,7 +1275,7 @@
                           <node concept="liA8E" id="4a$W5l2eait" role="2OqNvi">
                             <ref role="37wK5l" to="33ny:~Set.contains(java.lang.Object)" resolve="contains" />
                             <node concept="37vLTw" id="5O0_NfMA2qj" role="37wK5m">
-                              <ref role="3cqZAo" node="4a$W5l2eaiv" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1LR" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -1283,9 +1283,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4a$W5l2eaiv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1LR" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4a$W5l2eaiw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1LS" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1392,7 +1392,7 @@
                   <node concept="3clFbF" id="6clJcrKt4Kb" role="3cqZAp">
                     <node concept="2OqwBi" id="6clJcrKt516" role="3clFbG">
                       <node concept="37vLTw" id="6clJcrKt4Ka" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6clJcrKt4rz" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1LT" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="6clJcrKt6Ts" role="2OqNvi">
                         <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -1400,9 +1400,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6clJcrKt4rz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1LT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6clJcrKt4r$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1LU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1487,15 +1487,15 @@
                       <node concept="3clFbF" id="35NyAcQa22" role="3cqZAp">
                         <node concept="2OqwBi" id="35NyAcQa24" role="3clFbG">
                           <node concept="37vLTw" id="35NyAcQa23" role="2Oq$k0">
-                            <ref role="3cqZAo" node="35NyAcQa20" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1LV" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="35NyAcQa28" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="35NyAcQa20" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1LV" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="35NyAcQa21" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1LW" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1527,15 +1527,15 @@
                       <node concept="3clFbF" id="7RHXOmwbaEE" role="3cqZAp">
                         <node concept="2OqwBi" id="7RHXOmwbaEF" role="3clFbG">
                           <node concept="37vLTw" id="7RHXOmwbaEG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7RHXOmwbaEI" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1LX" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="7RHXOmwbaEH" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7RHXOmwbaEI" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1LX" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7RHXOmwbaEJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1LY" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1567,7 +1567,7 @@
                       <node concept="3clFbF" id="35NyAcQa2S" role="3cqZAp">
                         <node concept="2OqwBi" id="35NyAcQa2U" role="3clFbG">
                           <node concept="37vLTw" id="35NyAcQa2T" role="2Oq$k0">
-                            <ref role="3cqZAo" node="35NyAcQa2Q" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1LZ" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="35NyAcQa2Y" role="2OqNvi">
                             <ref role="37wK5l" node="35NyAcQ9Xn" resolve="createImportedProxy" />
@@ -1575,9 +1575,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="35NyAcQa2Q" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1LZ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="35NyAcQa2R" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1M0" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1797,7 +1797,7 @@
                   <node concept="3clFbF" id="6rD2$2scH6J" role="3cqZAp">
                     <node concept="2OqwBi" id="6rD2$2scHrd" role="3clFbG">
                       <node concept="37vLTw" id="6rD2$2scH6I" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6TPUpoC$R3L" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1M1" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6rD2$2scI9S" role="2OqNvi">
                         <ref role="37wK5l" node="6rD2$2sc6_0" resolve="isSourceFileContent" />
@@ -1805,9 +1805,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6TPUpoC$R3L" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1M1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6TPUpoC$R3M" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1M2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1834,7 +1834,7 @@
                   <node concept="3clFbF" id="6rD2$2scJ42" role="3cqZAp">
                     <node concept="2OqwBi" id="6rD2$2scJoy" role="3clFbG">
                       <node concept="37vLTw" id="6rD2$2scJ3u" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1pUJNHTblI_" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1M3" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6rD2$2sZXcM" role="2OqNvi">
                         <ref role="37wK5l" node="6rD2$2sc8kI" resolve="isHeaderFileContent" />
@@ -1842,9 +1842,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1pUJNHTblI_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1M3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1pUJNHTblIA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1M4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2236,11 +2236,11 @@
                                                     </node>
                                                   </node>
                                                   <node concept="37vLTw" id="5EE0R5HzIl_" role="37wK5m">
-                                                    <ref role="3cqZAo" node="5EE0R5HzIlN" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1M5" resolve="it" />
                                                   </node>
                                                   <node concept="2OqwBi" id="5EE0R5HzIlA" role="37wK5m">
                                                     <node concept="37vLTw" id="5EE0R5HzIlB" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="5EE0R5HzIlN" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN1M5" resolve="it" />
                                                     </node>
                                                     <node concept="2qgKlT" id="5EE0R5HzIlC" role="2OqNvi">
                                                       <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -2251,7 +2251,7 @@
                                                     <node concept="2OqwBi" id="4yCyDr3je14" role="37wK5m">
                                                       <node concept="2OqwBi" id="5EE0R5HzIlE" role="2Oq$k0">
                                                         <node concept="37vLTw" id="5EE0R5HzIlF" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="5EE0R5HzIlN" resolve="it" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN1M5" resolve="it" />
                                                         </node>
                                                         <node concept="2yIwOk" id="4yCyDr3jcX6" role="2OqNvi" />
                                                       </node>
@@ -2275,9 +2275,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="5EE0R5HzIlN" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1M5" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="5EE0R5HzIlO" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1M6" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3021,7 +3021,7 @@
                     <node concept="3clFbF" id="7RiewQ_lfXm" role="3cqZAp">
                       <node concept="2OqwBi" id="7RiewQ_lfXo" role="3clFbG">
                         <node concept="37vLTw" id="7RiewQ_lfXn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7RiewQ_lfXk" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1M7" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="7RiewQ_lfXs" role="2OqNvi">
                           <node concept="chp4Y" id="7RiewQ_lfXu" role="cj9EA">
@@ -3031,9 +3031,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7RiewQ_lfXk" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1M7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7RiewQ_lfXl" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1M8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3047,14 +3047,14 @@
                         <ref role="cht4Q" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
                       </node>
                       <node concept="37vLTw" id="7RiewQ_lfX0" role="1m5AlR">
-                        <ref role="3cqZAo" node="7RiewQ_lfWX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1M9" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7RiewQ_lfWX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1M9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7RiewQ_lfWY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ma" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3118,15 +3118,15 @@
                       <node concept="3clFbF" id="EtWtmfLeoe" role="3cqZAp">
                         <node concept="2OqwBi" id="EtWtmfLeog" role="3clFbG">
                           <node concept="37vLTw" id="EtWtmfLeof" role="2Oq$k0">
-                            <ref role="3cqZAo" node="EtWtmfLeoc" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Mb" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="EtWtmfLeok" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="EtWtmfLeoc" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Mb" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="EtWtmfLeod" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Mc" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3375,7 +3375,7 @@
                     <node concept="2OqwBi" id="7RiewQ_lfUk" role="3clFbG">
                       <node concept="2OqwBi" id="7RiewQ_lfUf" role="2Oq$k0">
                         <node concept="37vLTw" id="7RiewQ_lfUc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7RiewQ_lfTY" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Md" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5CXUFNJBP$f" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -3389,9 +3389,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7RiewQ_lfTY" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Md" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7RiewQ_lfTZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Me" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3493,7 +3493,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5qxpWJ$yPYw" role="1m5AlR">
                                     <node concept="37vLTw" id="5qxpWJ$yPYx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5TkTUuecYYr" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Mf" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="5qxpWJ$yPYy" role="2OqNvi">
                                       <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -3607,7 +3607,7 @@
                         <node concept="2OqwBi" id="5qxpWJ$gETU" role="3uHU7B">
                           <node concept="2OqwBi" id="5qxpWJ$lMjG" role="2Oq$k0">
                             <node concept="37vLTw" id="5qxpWJ$lGyq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5TkTUuecYYr" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Mf" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5qxpWJ$lNSm" role="2OqNvi">
                               <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -3639,7 +3639,7 @@
                               </node>
                               <node concept="2OqwBi" id="5TkTUuecYYo" role="3uHU7B">
                                 <node concept="37vLTw" id="5TkTUuecYYp" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5TkTUuecYYr" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Mf" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5TkTUuecYYq" role="2OqNvi">
                                   <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -3651,9 +3651,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5TkTUuecYYr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Mf" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5TkTUuecYYs" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Mg" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3869,7 +3869,7 @@
                       <node concept="2OqwBi" id="7RHXOmvWLXJ" role="3clFbG">
                         <node concept="2OqwBi" id="7RHXOmvWLXK" role="2Oq$k0">
                           <node concept="37vLTw" id="7RHXOmvWLXL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7RHXOmvWLXP" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Mv" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="7RHXOmvWLXM" role="2OqNvi">
                             <ref role="3TsBF5" to="x27k:3kEjc_WIKGg" resolve="headerFileName" />
@@ -3884,9 +3884,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7RHXOmvWLXP" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Mv" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7RHXOmvWLXQ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Mw" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3921,7 +3921,7 @@
                         <node concept="2OqwBi" id="6xgYZvd_Fom" role="3clFbG">
                           <node concept="2OqwBi" id="6xgYZvd_Fon" role="2Oq$k0">
                             <node concept="37vLTw" id="6xgYZvd_Foo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6xgYZvd_Eon" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Mx" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6xgYZvd_Fop" role="2OqNvi">
                               <ref role="3Tt5mk" to="vs0r:DubiFAXDKB" resolve="chunk" />
@@ -3935,9 +3935,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6xgYZvd_Eon" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Mx" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6xgYZvd_Eoo" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1My" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3961,7 +3961,7 @@
                               </node>
                               <node concept="2OqwBi" id="6xgYZvdyWQb" role="1m5AlR">
                                 <node concept="37vLTw" id="6xgYZvdyWQc" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6xgYZvbKaHa" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Mz" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6xgYZvdyWQd" role="2OqNvi">
                                   <ref role="3Tt5mk" to="vs0r:DubiFAXDKB" resolve="chunk" />
@@ -4012,9 +4012,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6xgYZvbKaHa" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Mz" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6xgYZvbKaHb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1M$" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4245,7 +4245,7 @@
                       <node concept="3fqX7Q" id="5qxpWJ_v3ev" role="3clFbG">
                         <node concept="2OqwBi" id="5qxpWJ_v3ew" role="3fr31v">
                           <node concept="37vLTw" id="5qxpWJ_v3ex" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5qxpWJ_v3ez" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1M_" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5qxpWJ_v3ey" role="2OqNvi">
                             <ref role="3TsBF5" to="x27k:4GT16cGgLYC" resolve="addToHeader" />
@@ -4254,9 +4254,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5qxpWJ_v3ez" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1M_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5qxpWJ_v3e$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1MA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4275,7 +4275,7 @@
                       <node concept="3fqX7Q" id="5qxpWJ_v2BM" role="3clFbG">
                         <node concept="2OqwBi" id="5qxpWJ_v2BN" role="3fr31v">
                           <node concept="37vLTw" id="5qxpWJ_v2BO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5qxpWJ_v2BQ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1MB" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="5qxpWJ_v2BP" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:6clJcrKt_a0" resolve="isReexported" />
@@ -4284,9 +4284,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5qxpWJ_v2BQ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1MB" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5qxpWJ_v2BR" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1MC" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4321,7 +4321,7 @@
                     <node concept="3clFbF" id="5qxpWJ_v4rh" role="3cqZAp">
                       <node concept="2OqwBi" id="5qxpWJ_v4ri" role="3clFbG">
                         <node concept="37vLTw" id="5qxpWJ_v4rj" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5qxpWJ_v4rl" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1MD" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="5qxpWJ_v4rk" role="2OqNvi">
                           <ref role="3TsBF5" to="x27k:4GT16cGgLYC" resolve="addToHeader" />
@@ -4329,9 +4329,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5qxpWJ_v4rl" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1MD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5qxpWJ_v4rm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1ME" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4349,7 +4349,7 @@
                     <node concept="3clFbF" id="5qxpWJ_v3Ot" role="3cqZAp">
                       <node concept="2OqwBi" id="5qxpWJ_v3Ou" role="3clFbG">
                         <node concept="37vLTw" id="5qxpWJ_v3Ov" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5qxpWJ_v3Ox" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1MF" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5qxpWJ_v3Ow" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:6clJcrKt_a0" resolve="isReexported" />
@@ -4357,9 +4357,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5qxpWJ_v3Ox" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1MF" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5qxpWJ_v3Oy" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1MG" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4451,7 +4451,7 @@
                                 <node concept="17QLQc" id="5qxpWJ_uHx0" role="3clFbG">
                                   <node concept="2OqwBi" id="5qxpWJ_uHx1" role="3uHU7w">
                                     <node concept="37vLTw" id="5qxpWJ_uHx2" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5qxpWJ_uHx9" resolve="stdHeader" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1MJ" resolve="stdHeader" />
                                     </node>
                                     <node concept="3TrcHB" id="5qxpWJ_uHx3" role="2OqNvi">
                                       <ref role="3TsBF5" to="x27k:3kEjc_WIKGg" resolve="headerFileName" />
@@ -4459,7 +4459,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5qxpWJ_uHx4" role="3uHU7B">
                                     <node concept="37vLTw" id="5qxpWJ_uHx5" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5qxpWJ_uHx7" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1MH" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="5qxpWJ_uHx6" role="2OqNvi">
                                       <ref role="3TsBF5" to="x27k:5jyom5fOqJg" resolve="path" />
@@ -4468,18 +4468,18 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5qxpWJ_uHx7" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1MH" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5qxpWJ_uHx8" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1MI" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5qxpWJ_uHx9" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1MJ" role="1bW2Oz">
                     <property role="TrG5h" value="stdHeader" />
-                    <node concept="2jxLKc" id="5qxpWJ_uHxa" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1MK" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4530,7 +4530,7 @@
                       <node concept="3clFbF" id="2qdxtjsXduu" role="3cqZAp">
                         <node concept="2OqwBi" id="2qdxtjsXduv" role="3clFbG">
                           <node concept="37vLTw" id="2qdxtjsXduw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2qdxtjsXduy" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1ML" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2qdxtjsXdux" role="2OqNvi">
                             <ref role="3TsBF5" to="x27k:7e09zBH54Yr" resolve="generateHeader" />
@@ -4538,9 +4538,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2qdxtjsXduy" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1ML" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2qdxtjsXduz" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1MM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4554,7 +4554,7 @@
                           <node concept="1pGfFk" id="2qdxtjsXduE" role="2ShVmc">
                             <ref role="37wK5l" node="slnbckEdqj" resolve="ModuleImportsAnalyzer" />
                             <node concept="37vLTw" id="2qdxtjsXduF" role="37wK5m">
-                              <ref role="3cqZAo" node="2qdxtjsXduI" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1MN" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -4565,9 +4565,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2qdxtjsXduI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1MN" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2qdxtjsXduJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1MO" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4842,7 +4842,7 @@
                                   <property role="Xl_RC" value="package " />
                                 </node>
                                 <node concept="37vLTw" id="6GZLGDRre6I" role="3uHU7w">
-                                  <ref role="3cqZAo" node="6GZLGDRrf$6" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1MP" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -4850,9 +4850,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6GZLGDRrf$6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1MP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6GZLGDRrf$7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1MQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4971,9 +4971,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6GZLGDRs4Cn" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1MR" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6GZLGDRs4Co" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1MS" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5246,7 +5246,7 @@
                   <node concept="3clFbF" id="1H6zsul0F6l" role="3cqZAp">
                     <node concept="2OqwBi" id="1H6zsul1aGH" role="3clFbG">
                       <node concept="37vLTw" id="1H6zsul12lV" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1H6zsul0F1k" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1MT" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4UbnhBFeQr3" role="2OqNvi">
                         <ref role="37wK5l" node="4UbnhBFeL_b" resolve="isInlineFunctionForHeader" />
@@ -5254,9 +5254,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1H6zsul0F1k" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1MT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1H6zsul0F1l" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1MU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5334,7 +5334,7 @@
                   <node concept="3clFbF" id="41uJ_cWnvbp" role="3cqZAp">
                     <node concept="2OqwBi" id="41uJ_cWnvqK" role="3clFbG">
                       <node concept="37vLTw" id="41uJ_cWnvbo" role="2Oq$k0">
-                        <ref role="3cqZAo" node="41uJ_cWnuXH" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1MV" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="41uJ_cWnvSi" role="2OqNvi">
                         <ref role="37wK5l" node="2MbfxrZIa1M" resolve="actsAsMainFunction" />
@@ -5342,9 +5342,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="41uJ_cWnuXH" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1MV" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="41uJ_cWnuXI" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1MW" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5590,7 +5590,7 @@
                       </node>
                       <node concept="2OqwBi" id="73rNuZmI7wE" role="1m5AlR">
                         <node concept="37vLTw" id="73rNuZmI7sY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="73rNuZmI7qn" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1MX" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="73rNuZmI7AZ" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:70kXLV4LLzy" resolve="target" />
@@ -5599,9 +5599,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="73rNuZmI7qn" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1MX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="73rNuZmI7qo" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1MY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5916,7 +5916,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="7yOTiF0SDd1" role="3uHU7B">
                                         <node concept="37vLTw" id="7yOTiF0SDd2" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7yOTiF0SDak" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1MZ" resolve="it" />
                                         </node>
                                         <node concept="2bSWHS" id="7yOTiF0SDd3" role="2OqNvi" />
                                       </node>
@@ -5926,7 +5926,7 @@
                               </node>
                               <node concept="2OqwBi" id="7yOTiF0SDb7" role="3uHU7w">
                                 <node concept="37vLTw" id="7yOTiF0SDaM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7yOTiF0SDak" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1MZ" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="7yOTiF0SDbd" role="2OqNvi">
                                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -5943,9 +5943,9 @@
                         <property role="TrG5h" value="s" />
                         <node concept="17QB3L" id="7yOTiF0SDao" role="1tU5fm" />
                       </node>
-                      <node concept="Rh6nW" id="7yOTiF0SDak" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1MZ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7yOTiF0SDal" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1N0" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="Xl_RD" id="7yOTiF0SDan" role="1MDeny" />
@@ -6829,7 +6829,7 @@
                         <node concept="3clFbF" id="5RuoYRFb96P" role="3cqZAp">
                           <node concept="2OqwBi" id="5RuoYRFb97b" role="3clFbG">
                             <node concept="37vLTw" id="5RuoYRFb96Q" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5RuoYRFb96N" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1N1" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5RuoYRFb97h" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -6837,9 +6837,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5RuoYRFb96N" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1N1" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5RuoYRFb96O" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1N2" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -7655,7 +7655,7 @@
                         <node concept="3clFbF" id="3kfXlW6o2df" role="3cqZAp">
                           <node concept="2OqwBi" id="3kfXlW6o2dg" role="3clFbG">
                             <node concept="37vLTw" id="3kfXlW6o2dh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3kfXlW6o2dj" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1N3" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3kfXlW6o2di" role="2OqNvi">
                               <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -7663,9 +7663,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3kfXlW6o2dj" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1N3" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3kfXlW6o2dk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1N4" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8528,16 +8528,16 @@
                           </node>
                           <node concept="2OqwBi" id="3hgxKzbj1TS" role="3uHU7B">
                             <node concept="37vLTw" id="3hgxKzbj1TR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3hgxKzbj1TL" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1N5" resolve="it" />
                             </node>
                             <node concept="2ZHEkA" id="3hgxKzbj1TX" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3hgxKzbj1TL" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1N5" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3hgxKzbj1TM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1N6" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8920,7 +8920,7 @@
                       </node>
                       <node concept="2OqwBi" id="29JE8qNwvM5" role="33vP2m">
                         <node concept="37vLTw" id="29JE8qNwvM6" role="2Oq$k0">
-                          <ref role="3cqZAo" node="29JE8qNwvLz" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1N7" resolve="it" />
                         </node>
                         <node concept="1_qnLN" id="29JE8qNwvM7" role="2OqNvi">
                           <ref role="1_rbq0" to="mj1l:7FQByU3CrDB" resolve="NumberLiteral" />
@@ -8944,9 +8944,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="29JE8qNwvLz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1N7" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="29JE8qNwvL$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1N8" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9008,7 +9008,7 @@
                   <node concept="3clFbF" id="29JE8qNwvOg" role="3cqZAp">
                     <node concept="2OqwBi" id="29JE8qNwvNq" role="3clFbG">
                       <node concept="37vLTw" id="29JE8qNwvNr" role="2Oq$k0">
-                        <ref role="3cqZAo" node="29JE8qNwvN_" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1N9" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="29JE8qNwvNM" role="2OqNvi">
                         <node concept="2OqwBi" id="6ydhAa2kBSr" role="1P9ThW">
@@ -9020,7 +9020,7 @@
                               <node concept="2OqwBi" id="6ydhAa2k6Lk" role="25WWJ7">
                                 <node concept="2OqwBi" id="6ydhAa2jZtU" role="2Oq$k0">
                                   <node concept="37vLTw" id="6ydhAa2jYk9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="29JE8qNwvN_" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1N9" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6ydhAa2k46Q" role="2OqNvi">
                                     <ref role="3Tt5mk" to="x27k:6lGvXEGP3PQ" resolve="arg" />
@@ -9036,9 +9036,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="29JE8qNwvN_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1N9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="29JE8qNwvNA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Na" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9756,7 +9756,7 @@
                     <node concept="3clFbF" id="7bk7NuH0Lfz" role="3cqZAp">
                       <node concept="2OqwBi" id="7bk7NuH0Llh" role="3clFbG">
                         <node concept="37vLTw" id="7bk7NuH0Lfy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7bk7NuH0LcL" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nb" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7bk7NuH0LVV" role="2OqNvi">
                           <ref role="37wK5l" to="ywuz:6SENleF$SRD" resolve="isSideeffectFree" />
@@ -9764,9 +9764,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7bk7NuH0LcL" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Nb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7bk7NuH0LcM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Nc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9837,7 +9837,7 @@
                     <node concept="3clFbF" id="6ydhAa2igYY" role="3cqZAp">
                       <node concept="2OqwBi" id="6ydhAa2iiew" role="3clFbG">
                         <node concept="37vLTw" id="6ydhAa2igYX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6ydhAa2igvb" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nd" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6ydhAa2in5Y" role="2OqNvi">
                           <ref role="37wK5l" to="ywuz:3ilck8Kr3zN" resolve="isStaticallyEvaluatable" />
@@ -9845,9 +9845,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6ydhAa2igvb" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Nd" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6ydhAa2igvc" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ne" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10025,7 +10025,7 @@
                         <node concept="3clFbF" id="5_glYRwuc5D" role="3cqZAp">
                           <node concept="2OqwBi" id="5_glYRwuc5E" role="3clFbG">
                             <node concept="37vLTw" id="5_glYRwuc5F" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5_glYRwuc5H" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Nf" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5_glYRwuc5G" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -10033,9 +10033,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5_glYRwuc5H" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Nf" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5_glYRwuc5I" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ng" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -10140,7 +10140,7 @@
                       <node concept="3$87h9" id="7oI7FI6rWvK" role="33vP2m">
                         <ref role="37wK5l" node="7oI7FI6rWr6" resolve="getDeclaration" />
                         <node concept="37vLTw" id="7oI7FI6rWvL" role="37wK5m">
-                          <ref role="3cqZAo" node="7oI7FI6rWvC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nh" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -10168,9 +10168,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7oI7FI6rWvC" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nh" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7oI7FI6rWvD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ni" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10195,7 +10195,7 @@
                       <node concept="3Tqbb2" id="1tHnH2eLVak" role="1tU5fm" />
                       <node concept="2OqwBi" id="1tHnH2eLVau" role="33vP2m">
                         <node concept="37vLTw" id="1tHnH2eLVav" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1tHnH2eLFY3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nj" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="1tHnH2eLVaw" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:7jSUHHvkAph" resolve="referencedModuleContent" />
@@ -10235,9 +10235,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1tHnH2eLFY3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nj" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1tHnH2eLFY4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Nk" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10637,7 +10637,7 @@
                       </node>
                       <node concept="2OqwBi" id="6Pt2vx4tXtK" role="1m5AlR">
                         <node concept="37vLTw" id="6Pt2vx4tXqd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Pt2vx4tXnT" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nl" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6Pt2vx4tXG7" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:70kXLV4LLzy" resolve="target" />
@@ -10646,9 +10646,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Pt2vx4tXnT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nl" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Pt2vx4tXnU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Nm" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10894,7 +10894,7 @@
                       </node>
                       <node concept="2OqwBi" id="73rNuZmI853" role="1m5AlR">
                         <node concept="37vLTw" id="73rNuZmI854" role="2Oq$k0">
-                          <ref role="3cqZAo" node="73rNuZmI856" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nn" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="73rNuZmI855" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:70kXLV4LLzy" resolve="target" />
@@ -10903,9 +10903,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="73rNuZmI856" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nn" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="73rNuZmI857" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1No" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11761,7 +11761,7 @@
                       <node concept="2OqwBi" id="6o2p2Z0FkVD" role="33vP2m">
                         <node concept="2JrnkZ" id="6o2p2Z0FkVE" role="2Oq$k0">
                           <node concept="37vLTw" id="6o2p2Z0FkVF" role="2JrQYb">
-                            <ref role="3cqZAo" node="6o2p2Z0FkW5" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Np" resolve="it" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6o2p2Z0FkVG" role="2OqNvi">
@@ -11826,9 +11826,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkW5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Np" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkW6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Nq" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11868,7 +11868,7 @@
                       <ref role="37wK5l" node="6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkWp" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkWq" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkWs" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nr" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkWr" role="2OqNvi">
                           <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -11877,9 +11877,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkWs" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nr" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkWt" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ns" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11920,7 +11920,7 @@
                       <ref role="37wK5l" node="6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkX7" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkX8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkXa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nt" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkX9" role="2OqNvi">
                           <ref role="3Tt5mk" to="x27k:2VsHNE72zUU" resolve="constant" />
@@ -11929,9 +11929,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkXa" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nt" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkXb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Nu" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11971,7 +11971,7 @@
                       <ref role="37wK5l" node="6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkXu" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkXv" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkXx" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nv" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkXw" role="2OqNvi">
                           <ref role="3Tt5mk" to="x27k:5ak6HMA0red" resolve="function" />
@@ -11980,9 +11980,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkXx" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nv" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkXy" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Nw" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12022,7 +12022,7 @@
                       <ref role="37wK5l" node="6o2p2Z0Fl4w" resolve="isOutside" />
                       <node concept="2OqwBi" id="6o2p2Z0FkXP" role="37wK5m">
                         <node concept="37vLTw" id="6o2p2Z0FkXQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0FkXS" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Nx" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6o2p2Z0FkXR" role="2OqNvi">
                           <ref role="3Tt5mk" to="x27k:7qHzltJ0oT5" resolve="function" />
@@ -12031,9 +12031,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkXS" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nx" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkXT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ny" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12097,7 +12097,7 @@
                   <node concept="3clFbF" id="6o2p2Z0FkZr" role="3cqZAp">
                     <node concept="2OqwBi" id="6o2p2Z0FkZs" role="3clFbG">
                       <node concept="37vLTw" id="6o2p2Z0FkZt" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6o2p2Z0FkZv" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Nz" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="6o2p2Z0FkZu" role="2OqNvi">
                         <ref role="3TsBF5" to="c4fa:3_fgNoLA7XY" resolve="static" />
@@ -12105,9 +12105,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0FkZv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Nz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0FkZw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1N$" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12184,7 +12184,7 @@
                       <node concept="2OqwBi" id="6o2p2Z0Fl03" role="2Oq$k0">
                         <node concept="2OqwBi" id="6o2p2Z0Fl04" role="2Oq$k0">
                           <node concept="37vLTw" id="6o2p2Z0Fl05" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6o2p2Z0Fl0q" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1NB" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6o2p2Z0Fl06" role="2OqNvi">
                             <ref role="37wK5l" to="ywuz:7QxE2Vg8Hif" resolve="getLValue" />
@@ -12209,7 +12209,7 @@
                                         <ref role="cht4Q" to="x27k:5IYyAOzCwFE" resolve="GlobalVarRef" />
                                       </node>
                                       <node concept="37vLTw" id="6o2p2Z0Fl0i" role="1m5AlR">
-                                        <ref role="3cqZAo" node="6o2p2Z0Fl0o" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1N_" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="6o2p2Z0Fl0j" role="2OqNvi">
@@ -12219,7 +12219,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6o2p2Z0Fl0k" role="3uHU7B">
                                   <node concept="37vLTw" id="6o2p2Z0Fl0l" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6o2p2Z0Fl0o" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1N_" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="6o2p2Z0Fl0m" role="2OqNvi">
                                     <node concept="chp4Y" id="6o2p2Z0Fl0n" role="cj9EA">
@@ -12230,18 +12230,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6o2p2Z0Fl0o" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1N_" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6o2p2Z0Fl0p" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1NA" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0Fl0q" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1NB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0Fl0r" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1NC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12323,7 +12323,7 @@
                       <node concept="2OqwBi" id="6o2p2Z0Fl10" role="2Oq$k0">
                         <node concept="2OqwBi" id="6o2p2Z0Fl11" role="2Oq$k0">
                           <node concept="37vLTw" id="6o2p2Z0Fl12" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6o2p2Z0Fl1n" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1NF" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6o2p2Z0Fl13" role="2OqNvi">
                             <ref role="37wK5l" to="ywuz:7QxE2Vg8Hif" resolve="getLValue" />
@@ -12348,7 +12348,7 @@
                                         <ref role="cht4Q" to="x27k:1OcdQnyTX2U" resolve="ArgumentRef" />
                                       </node>
                                       <node concept="37vLTw" id="6o2p2Z0Fl1f" role="1m5AlR">
-                                        <ref role="3cqZAo" node="6o2p2Z0Fl1l" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ND" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="6o2p2Z0Fl1g" role="2OqNvi">
@@ -12358,7 +12358,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6o2p2Z0Fl1h" role="3uHU7B">
                                   <node concept="37vLTw" id="6o2p2Z0Fl1i" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6o2p2Z0Fl1l" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ND" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="6o2p2Z0Fl1j" role="2OqNvi">
                                     <node concept="chp4Y" id="6o2p2Z0Fl1k" role="cj9EA">
@@ -12369,18 +12369,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6o2p2Z0Fl1l" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1ND" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6o2p2Z0Fl1m" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1NE" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0Fl1n" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1NF" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0Fl1o" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1NG" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12438,7 +12438,7 @@
                               </node>
                               <node concept="2OqwBi" id="6o2p2Z0Fl1O" role="1m5AlR">
                                 <node concept="37vLTw" id="6o2p2Z0Fl1P" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6o2p2Z0Fl1Y" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1NH" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6o2p2Z0Fl1Q" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -12453,7 +12453,7 @@
                         <node concept="2OqwBi" id="6o2p2Z0Fl1S" role="3uHU7B">
                           <node concept="2OqwBi" id="6o2p2Z0Fl1T" role="2Oq$k0">
                             <node concept="37vLTw" id="6o2p2Z0Fl1U" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6o2p2Z0Fl1Y" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1NH" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6o2p2Z0Fl1V" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -12468,9 +12468,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6o2p2Z0Fl1Y" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1NH" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6o2p2Z0Fl1Z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1NI" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12524,11 +12524,11 @@
                                 <node concept="3clFbF" id="6o2p2Z0Fl2o" role="3cqZAp">
                                   <node concept="3clFbC" id="6o2p2Z0Fl2p" role="3clFbG">
                                     <node concept="37vLTw" id="6o2p2Z0Fl2q" role="3uHU7w">
-                                      <ref role="3cqZAo" node="6o2p2Z0Fl2w" resolve="deref" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1NL" resolve="deref" />
                                     </node>
                                     <node concept="2OqwBi" id="6o2p2Z0Fl2r" role="3uHU7B">
                                       <node concept="37vLTw" id="6o2p2Z0Fl2s" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6o2p2Z0Fl2u" resolve="assign" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1NJ" resolve="assign" />
                                       </node>
                                       <node concept="2qgKlT" id="6o2p2Z0Fl2t" role="2OqNvi">
                                         <ref role="37wK5l" to="ywuz:7QxE2Vg8Hif" resolve="getLValue" />
@@ -12537,9 +12537,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6o2p2Z0Fl2u" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1NJ" role="1bW2Oz">
                                 <property role="TrG5h" value="assign" />
-                                <node concept="2jxLKc" id="6o2p2Z0Fl2v" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1NK" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -12547,9 +12547,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6o2p2Z0Fl2w" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1NL" role="1bW2Oz">
                     <property role="TrG5h" value="deref" />
-                    <node concept="2jxLKc" id="6o2p2Z0Fl2x" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1NM" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12602,7 +12602,7 @@
                           <node concept="2OqwBi" id="6o2p2Z0Fl2V" role="3fr31v">
                             <node concept="2OqwBi" id="6o2p2Z0Fl2W" role="2Oq$k0">
                               <node concept="37vLTw" id="6o2p2Z0Fl2X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6o2p2Z0Fl31" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1NN" resolve="it" />
                               </node>
                               <node concept="1mfA1w" id="6o2p2Z0Fl2Y" role="2OqNvi" />
                             </node>
@@ -12615,9 +12615,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6o2p2Z0Fl31" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1NN" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6o2p2Z0Fl32" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1NO" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -12632,7 +12632,7 @@
                         </node>
                         <node concept="2OqwBi" id="6o2p2Z0Fl39" role="3uHU7B">
                           <node concept="37vLTw" id="6o2p2Z0Fl3a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6o2p2Z0Fl3c" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1NP" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6o2p2Z0Fl3b" role="2OqNvi">
                             <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -12641,9 +12641,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6o2p2Z0Fl3c" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1NP" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6o2p2Z0Fl3d" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1NQ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12705,7 +12705,7 @@
                       </node>
                       <node concept="2OqwBi" id="6o2p2Z0Fl3C" role="33vP2m">
                         <node concept="37vLTw" id="6o2p2Z0Fl3D" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6o2p2Z0Fl42" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1NR" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6o2p2Z0Fl3E" role="2OqNvi">
                           <ref role="37wK5l" to="ywuz:7QxE2Vg8Hif" resolve="getLValue" />
@@ -12778,9 +12778,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6o2p2Z0Fl42" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1NR" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6o2p2Z0Fl43" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1NS" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -13469,7 +13469,7 @@
                           <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.Object)" resolve="append" />
                           <node concept="2OqwBi" id="6Pt2vx4BTXg" role="37wK5m">
                             <node concept="37vLTw" id="6Pt2vx4BTXh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Pt2vx4BTXl" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1NT" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="6Pt2vx4BTXi" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
@@ -13485,9 +13485,9 @@
                       <ref role="3uigEE" to="wyt6:~StringBuffer" resolve="StringBuffer" />
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Pt2vx4BTXl" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1NT" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Pt2vx4BTXm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1NU" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="6Pt2vx4BTXn" role="1MDeny">
@@ -14071,7 +14071,7 @@
                               <node concept="2OqwBi" id="6xgYZvdJmUW" role="3uHU7B">
                                 <node concept="2OqwBi" id="6xgYZvdI_pS" role="2Oq$k0">
                                   <node concept="37vLTw" id="6xgYZvdI_pT" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6xgYZvdI_pV" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1NV" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="6xgYZvdI_pU" role="2OqNvi">
                                     <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -14084,9 +14084,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6xgYZvdI_pV" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1NV" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6xgYZvdI_pW" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1NW" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -14163,7 +14163,7 @@
                               <node concept="2OqwBi" id="6xgYZvdI_qu" role="3uHU7B">
                                 <node concept="2OqwBi" id="6xgYZvdI_qv" role="2Oq$k0">
                                   <node concept="37vLTw" id="6xgYZvdI_qw" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6xgYZvdI_qK" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1NX" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="6xgYZvdI_qx" role="2OqNvi">
                                     <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -14184,7 +14184,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="6xgYZvdI_qD" role="1m5AlR">
                                         <node concept="37vLTw" id="6xgYZvdI_qE" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6xgYZvdI_qK" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1NX" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="6xgYZvdI_qF" role="2OqNvi">
                                           <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -14206,9 +14206,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6xgYZvdI_qK" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1NX" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6xgYZvdI_qL" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1NY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/com.mbeddr.core.modules.enumMigration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/com.mbeddr.core.modules.enumMigration.mps
index 70b1a79a2d5..7d834d5f883 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/com.mbeddr.core.modules.enumMigration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/com.mbeddr.core.modules.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/constraints.mps
index 074d6bc66e1..5898b36ec04 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/constraints.mps
@@ -36,7 +36,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -109,7 +109,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,7 +126,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -173,6 +173,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -238,7 +239,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -263,7 +264,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -323,7 +323,7 @@
                         <node concept="3clFbF" id="5CkU_dHifvI" role="3cqZAp">
                           <node concept="2OqwBi" id="5CkU_dHifvJ" role="3clFbG">
                             <node concept="37vLTw" id="5CkU_dHifvK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHifvM" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1NZ" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5CkU_dHifvL" role="2OqNvi">
                               <ref role="37wK5l" to="qd6m:UslQeyoOp4" resolve="participatesInScope" />
@@ -331,9 +331,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHifvM" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1NZ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHifvN" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1O0" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps
index 9e20ab6130d..79597ad0e00 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps
@@ -132,7 +132,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -262,7 +262,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -286,7 +286,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -462,7 +462,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
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 ddff01ebbd9..b1e0760b256 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
@@ -34,6 +34,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" implicit="true" />
@@ -441,6 +442,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -626,7 +628,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -4005,7 +4006,7 @@
                               </node>
                               <node concept="2OqwBi" id="2$xXL4HCU73" role="1m5AlR">
                                 <node concept="37vLTw" id="2$xXL4HCTG9" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1O1" resolve="it" />
                                 </node>
                                 <node concept="1mfA1w" id="2$xXL4HCZxY" role="2OqNvi" />
                               </node>
@@ -4018,7 +4019,7 @@
                         <node concept="2OqwBi" id="2Fugwv5X9sv" role="3uHU7B">
                           <node concept="2OqwBi" id="2$xXL4HtRNL" role="2Oq$k0">
                             <node concept="37vLTw" id="2$xXL4HtRNM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1O1" resolve="it" />
                             </node>
                             <node concept="2NL2c5" id="2Fugwv5X5z7" role="2OqNvi" />
                           </node>
@@ -4030,7 +4031,7 @@
                       <node concept="2OqwBi" id="2$xXL4HtRNO" role="3uHU7B">
                         <node concept="2OqwBi" id="2$xXL4HtRNP" role="2Oq$k0">
                           <node concept="37vLTw" id="2$xXL4HtRNQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1O1" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="2$xXL4HtRNR" role="2OqNvi" />
                         </node>
@@ -4043,9 +4044,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2$xXL4HtRNU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1O1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2$xXL4HtRNV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1O2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5763,15 +5764,15 @@
                                 <node concept="2OqwBi" id="2cvVnUv6BYV" role="2Oq$k0">
                                   <node concept="3n3YKJ" id="3uuB$tyGwmp" role="2OqNvi" />
                                   <node concept="37vLTw" id="2cvVnUv6BYX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2cvVnUv6BZ9" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1O3" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="17RvpY" id="2cvVnUv6BYY" role="2OqNvi" />
                               </node>
                               <node concept="2OqwBi" id="6g_o1CJFVa9" role="3uHU7w">
                                 <node concept="2YIFZM" id="6g_o1CJFWjE" role="2Oq$k0">
-                                  <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
-                                  <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                                  <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+                                  <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                                   <node concept="2OqwBi" id="6g_o1CJFWjF" role="37wK5m">
                                     <node concept="2OqwBi" id="6g_o1CJFWjG" role="2Oq$k0">
                                       <node concept="2OqwBi" id="6g_o1CJFWjH" role="2Oq$k0">
@@ -5791,7 +5792,7 @@
                                       <node concept="liA8E" id="6g_o1CJFWjO" role="2OqNvi">
                                         <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
                                         <node concept="37vLTw" id="6g_o1CJFWjP" role="37wK5m">
-                                          <ref role="3cqZAo" node="2cvVnUv6BZ9" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1O3" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -5807,9 +5808,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2cvVnUv6BZ9" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1O3" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2cvVnUv6BZa" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1O4" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5932,15 +5933,15 @@
                                 <node concept="2OqwBi" id="2cvVnUv6C0c" role="2Oq$k0">
                                   <node concept="3n3YKJ" id="3uuB$tyGs28" role="2OqNvi" />
                                   <node concept="37vLTw" id="2cvVnUv6C0e" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2cvVnUv6C0q" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1O5" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="17RvpY" id="2cvVnUv6C0f" role="2OqNvi" />
                               </node>
                               <node concept="2OqwBi" id="6g_o1CJG29V" role="3uHU7w">
                                 <node concept="2YIFZM" id="6g_o1CJG3eu" role="2Oq$k0">
-                                  <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
-                                  <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                                  <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+                                  <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                                   <node concept="2OqwBi" id="6g_o1CJG3ev" role="37wK5m">
                                     <node concept="2OqwBi" id="6g_o1CJG3ew" role="2Oq$k0">
                                       <node concept="2OqwBi" id="6g_o1CJG3ex" role="2Oq$k0">
@@ -5960,7 +5961,7 @@
                                       <node concept="liA8E" id="6g_o1CJG3eC" role="2OqNvi">
                                         <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
                                         <node concept="37vLTw" id="6g_o1CJG3eD" role="37wK5m">
-                                          <ref role="3cqZAo" node="2cvVnUv6C0q" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1O5" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -5976,9 +5977,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2cvVnUv6C0q" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1O5" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2cvVnUv6C0r" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1O6" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/findUsages.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/findUsages.mps
index d448b9b6e86..d18abf05651 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/findUsages.mps
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -75,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/intentions.mps
index 061111351d5..e9351768d19 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/intentions.mps
@@ -153,7 +153,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -170,7 +170,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -189,6 +189,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -346,7 +347,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -365,7 +366,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1456,7 +1456,7 @@
                     <node concept="3clFbF" id="4SZUaIKnjsR" role="3cqZAp">
                       <node concept="2OqwBi" id="4SZUaIKnjtd" role="3clFbG">
                         <node concept="37vLTw" id="4SZUaIKnjsS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4SZUaIKnjsP" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1O7" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4SZUaIKnjtj" role="2OqNvi">
                           <node concept="chp4Y" id="4SZUaIKnjtl" role="cj9EA">
@@ -1466,9 +1466,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4SZUaIKnjsP" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1O7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4SZUaIKnjsQ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1O8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1579,7 +1579,7 @@
                                 <node concept="3cpWs3" id="1mLkhC62cxr" role="WxPPp">
                                   <node concept="2OqwBi" id="1mLkhC62cxN" role="3uHU7w">
                                     <node concept="37vLTw" id="1mLkhC62cZC" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1mLkhC62cZz" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1O9" resolve="it" />
                                     </node>
                                     <node concept="2bSWHS" id="1mLkhC62cxT" role="2OqNvi" />
                                   </node>
@@ -1594,7 +1594,7 @@
                               <node concept="36biLy" id="7NouExiHsED" role="28nt2d">
                                 <node concept="2OqwBi" id="7NouExiHsEA" role="36biLW">
                                   <node concept="37vLTw" id="7NouExiHsEB" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1mLkhC62cZz" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1O9" resolve="it" />
                                   </node>
                                   <node concept="1$rogu" id="7NouExiHsEC" role="2OqNvi" />
                                 </node>
@@ -1606,9 +1606,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1mLkhC62cZz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1O9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1mLkhC62cZ$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Oa" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2534,15 +2534,15 @@
                       <node concept="3clFbF" id="2cAst3UgY2D" role="3cqZAp">
                         <node concept="2OqwBi" id="2cAst3UgY_9" role="3clFbG">
                           <node concept="37vLTw" id="2cAst3UgY2C" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2cAst3UgWJ6" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Ob" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="2cAst3Uh11N" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2cAst3UgWJ6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ob" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2cAst3UgWJ7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Oc" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2723,15 +2723,15 @@
                       <node concept="3clFbF" id="2cAst3Ukg2E" role="3cqZAp">
                         <node concept="2OqwBi" id="2cAst3Ukg_a" role="3clFbG">
                           <node concept="37vLTw" id="2cAst3Ukg2D" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2cAst3Ukf_Y" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Od" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="2cAst3Ukin6" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2cAst3Ukf_Y" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Od" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2cAst3Ukf_Z" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Oe" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5073,15 +5073,15 @@
                             <node concept="3clFbF" id="slnbcmrwQw" role="3cqZAp">
                               <node concept="2OqwBi" id="slnbcmrwZG" role="3clFbG">
                                 <node concept="37vLTw" id="slnbcmrwQv" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="slnbcmrwHX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Of" resolve="it" />
                                 </node>
                                 <node concept="1$rogu" id="slnbcmrxrZ" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="slnbcmrwHX" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Of" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="slnbcmrwHY" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Og" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/migration.mps
index 04b3864167b..19a5ff2d8fe 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/migration.mps
@@ -6,7 +6,7 @@
     <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -72,7 +72,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -82,7 +82,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -153,7 +153,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/plugin.mps
index 1cea4f2670c..57b4b6e9454 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:409e9269-8e01-4311-a25d-780598b0c00c(com.mbeddr.core.modules.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
@@ -10,7 +10,7 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -181,6 +181,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -248,7 +249,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -1076,7 +1076,7 @@
                           <node concept="3clFbF" id="3JYspdAoz8x" role="3cqZAp">
                             <node concept="2OqwBi" id="3JYspdAoz8y" role="3clFbG">
                               <node concept="37vLTw" id="3JYspdAoz8z" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3JYspdAoz8A" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1P3" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="3JYspdAoz8$" role="2OqNvi">
                                 <node concept="chp4Y" id="6O2$eQcdTZM" role="cj9EA">
@@ -1086,9 +1086,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3JYspdAoz8A" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1P3" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3JYspdAoz8B" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1P4" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/refactorings.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/refactorings.mps
index d3c599b9c27..76db97f5a2f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/refactorings.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/refactorings.mps
@@ -94,7 +94,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -110,7 +110,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -130,6 +130,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -220,7 +221,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -241,7 +242,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -809,7 +809,7 @@
                       </node>
                       <node concept="2OqwBi" id="25g4WfHx_or" role="37vLTJ">
                         <node concept="37vLTw" id="25g4WfHx_o6" role="2Oq$k0">
-                          <ref role="3cqZAo" node="25g4WfHx_o3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Oh" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="25g4WfHx_ox" role="2OqNvi">
                           <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -818,9 +818,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="25g4WfHx_o3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Oh" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="25g4WfHx_o4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Oi" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1055,7 +1055,7 @@
                     <node concept="3clFbF" id="KU5KLY42O8" role="3cqZAp">
                       <node concept="2OqwBi" id="KU5KLY42O9" role="3clFbG">
                         <node concept="37vLTw" id="KU5KLY42Oa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KU5KLY42Od" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Oj" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="KU5KLY42Ob" role="2OqNvi">
                           <node concept="chp4Y" id="KU5KLY42Oc" role="cj9EA">
@@ -1065,9 +1065,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="KU5KLY42Od" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Oj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="KU5KLY42Oe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ok" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps
index 0fedbd45cea..837e9ef6cf7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps
@@ -71,7 +71,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -150,7 +150,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
index ae7b66302ab..422711b800e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
@@ -75,7 +75,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -185,7 +185,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -213,7 +213,7 @@
       <concept id="7024111702304501418" name="jetbrains.mps.baseLanguage.structure.AndAssignmentExpression" flags="nn" index="3vZ8ra" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -242,6 +242,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -478,7 +479,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -525,7 +526,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -633,7 +633,7 @@
                     <node concept="3clFbF" id="76N1O$Ki_Nb" role="3cqZAp">
                       <node concept="2OqwBi" id="76N1O$Ki_Nc" role="3clFbG">
                         <node concept="37vLTw" id="76N1O$Ki_Nd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="76N1O$Ki_Nf" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Ol" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="76N1O$Ki_Ne" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -641,9 +641,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="76N1O$Ki_Nf" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ol" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="76N1O$Ki_Ng" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Om" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1312,7 +1312,7 @@
                                   <node concept="2OqwBi" id="slnbclUz15" role="3clFbG">
                                     <node concept="2OqwBi" id="slnbclUz16" role="2Oq$k0">
                                       <node concept="37vLTw" id="slnbclUz17" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="slnbclUz1a" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1On" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="slnbclUz18" role="2OqNvi">
                                         <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -1322,9 +1322,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="slnbclUz1a" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1On" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="slnbclUz1b" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Oo" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2529,7 +2529,7 @@
                                   <node concept="3clFbF" id="slnbckBPWE" role="3cqZAp">
                                     <node concept="2OqwBi" id="slnbckBPWF" role="3clFbG">
                                       <node concept="37vLTw" id="slnbckBPWG" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="slnbckBPWI" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Op" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="slnbckBPWH" role="2OqNvi">
                                         <ref role="3TsBF5" to="vs0r:DubiFAXCMb" resolve="reexport" />
@@ -2537,9 +2537,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="slnbckBPWI" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1Op" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="slnbckBPWJ" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1Oq" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2597,7 +2597,7 @@
                             <node concept="3clFbF" id="7dfuMW5R8vj" role="3cqZAp">
                               <node concept="2OqwBi" id="7dfuMW5R8vk" role="3clFbG">
                                 <node concept="37vLTw" id="7dfuMW5R8vl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7dfuMW5R8vn" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Or" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="7dfuMW5R8vm" role="2OqNvi">
                                   <ref role="37wK5l" to="hwgx:6clJcrKt_a0" resolve="isReexported" />
@@ -2605,9 +2605,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7dfuMW5R8vn" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Or" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7dfuMW5R8vo" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Os" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2673,7 +2673,7 @@
                       <node concept="3clFbF" id="1f0gqNzC6YG" role="3cqZAp">
                         <node concept="2OqwBi" id="1f0gqNzC6Z2" role="3clFbG">
                           <node concept="37vLTw" id="1f0gqNzC6YH" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1f0gqNzC6YE" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Ot" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="1f0gqNzC6Z8" role="2OqNvi">
                             <node concept="chp4Y" id="1f0gqNzC6Za" role="cj9EA">
@@ -2683,9 +2683,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1f0gqNzC6YE" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ot" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1f0gqNzC6YF" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ou" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4210,7 +4210,7 @@
                               <node concept="10Nm6u" id="pgfOqlwH5J" role="3uHU7w" />
                               <node concept="2OqwBi" id="pgfOqlwG0e" role="3uHU7B">
                                 <node concept="37vLTw" id="pgfOqlwFPk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="IrwlmWxNcX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ov" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="pgfOqlwGCP" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4220,7 +4220,7 @@
                             <node concept="2OqwBi" id="IrwlmWxNdL" role="3uHU7w">
                               <node concept="2OqwBi" id="IrwlmWxNdl" role="2Oq$k0">
                                 <node concept="37vLTw" id="IrwlmWxNd0" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="IrwlmWxNcX" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ov" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="IrwlmWxNdr" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4241,9 +4241,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="IrwlmWxNcX" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ov" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="IrwlmWxNcY" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ow" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4497,7 +4497,7 @@
                             <node concept="3y3z36" id="6uZAbUKddQA" role="3uHU7B">
                               <node concept="2OqwBi" id="6uZAbUKddQC" role="3uHU7B">
                                 <node concept="37vLTw" id="6uZAbUKddQD" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6uZAbUKddQN" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ox" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6uZAbUKddQE" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4510,14 +4510,14 @@
                                 <ref role="2Gs0qQ" node="6uZAbUKddB2" resolve="arg" />
                               </node>
                               <node concept="37vLTw" id="6uZAbUKdx$E" role="3uHU7B">
-                                <ref role="3cqZAo" node="6uZAbUKddQN" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ox" resolve="it" />
                               </node>
                             </node>
                           </node>
                           <node concept="2OqwBi" id="6uZAbUKddQF" role="3uHU7w">
                             <node concept="2OqwBi" id="6uZAbUKddQG" role="2Oq$k0">
                               <node concept="37vLTw" id="6uZAbUKddQH" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6uZAbUKddQN" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ox" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="6uZAbUKddQI" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4538,9 +4538,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6uZAbUKddQN" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Ox" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6uZAbUKddQO" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Oy" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5319,7 +5319,7 @@
                               <node concept="2OqwBi" id="7x67PKvE6fh" role="2Oq$k0">
                                 <node concept="2OqwBi" id="7x67PKvE5cI" role="2Oq$k0">
                                   <node concept="37vLTw" id="7x67PKvE4Zt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3z4m8HkqchP" resolve="call" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Oz" resolve="call" />
                                   </node>
                                   <node concept="3TrEf2" id="7x67PKvE5J6" role="2OqNvi">
                                     <ref role="3Tt5mk" to="x27k:5ak6HMA0red" resolve="function" />
@@ -5344,7 +5344,7 @@
                             <node concept="2OqwBi" id="3z4m8Hkqg5w" role="3fr31v">
                               <node concept="2OqwBi" id="3z4m8Hkqg5x" role="2Oq$k0">
                                 <node concept="37vLTw" id="3z4m8Hkqg5y" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3z4m8HkqchP" resolve="call" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Oz" resolve="call" />
                                 </node>
                                 <node concept="3TrEf2" id="3z4m8Hkqg5z" role="2OqNvi">
                                   <ref role="3Tt5mk" to="x27k:5ak6HMA0red" resolve="function" />
@@ -5358,9 +5358,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3z4m8HkqchP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Oz" role="1bW2Oz">
                       <property role="TrG5h" value="call" />
-                      <node concept="2jxLKc" id="3z4m8HkqchQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1O$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5373,13 +5373,13 @@
                         <property role="Xl_RC" value="can only call exported functions from exported inline function" />
                       </node>
                       <node concept="37vLTw" id="3z4m8HkqjOU" role="1urrMF">
-                        <ref role="3cqZAo" node="3z4m8Hkqhf_" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1O_" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3z4m8Hkqhf_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1O_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3z4m8HkqhfA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1OA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5410,7 +5410,7 @@
                               <node concept="2OqwBi" id="7x67PKvEauZ" role="2Oq$k0">
                                 <node concept="2OqwBi" id="7x67PKvE9yU" role="2Oq$k0">
                                   <node concept="37vLTw" id="7x67PKvE9lW" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3z4m8HkuApS" resolve="call" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1OB" resolve="call" />
                                   </node>
                                   <node concept="3TrEf2" id="7x67PKvEa3B" role="2OqNvi">
                                     <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -5435,7 +5435,7 @@
                             <node concept="2OqwBi" id="3z4m8HkuApN" role="3fr31v">
                               <node concept="2OqwBi" id="3z4m8HkuApO" role="2Oq$k0">
                                 <node concept="37vLTw" id="3z4m8HkuApP" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3z4m8HkuApS" resolve="call" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1OB" resolve="call" />
                                 </node>
                                 <node concept="3TrEf2" id="3z4m8HkuCbq" role="2OqNvi">
                                   <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -5449,9 +5449,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3z4m8HkuApS" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1OB" role="1bW2Oz">
                       <property role="TrG5h" value="call" />
-                      <node concept="2jxLKc" id="3z4m8HkuApT" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1OC" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5464,13 +5464,13 @@
                         <property role="Xl_RC" value="can only access exported global variables from exported inline function" />
                       </node>
                       <node concept="37vLTw" id="3z4m8HkuApZ" role="1urrMF">
-                        <ref role="3cqZAo" node="3z4m8HkuAq0" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1OD" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3z4m8HkuAq0" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1OD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3z4m8HkuAq1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1OE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6341,7 +6341,7 @@
                               <node concept="1pGfFk" id="56zXiDvfH6A" role="2ShVmc">
                                 <ref role="37wK5l" to="9xhd:7Ehk3$1DXTG" resolve="VariableWrapper" />
                                 <node concept="37vLTw" id="56zXiDvfH6B" role="37wK5m">
-                                  <ref role="3cqZAo" node="1MdOvoQtBwt" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1OF" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -6379,7 +6379,7 @@
                             <node concept="2OqwBi" id="L2WnbQQqPl" role="2Oq$k0">
                               <node concept="2OqwBi" id="1MdOvoQtBJm" role="2Oq$k0">
                                 <node concept="37vLTw" id="1MdOvoQtBBl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1MdOvoQtBwt" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1OF" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="L2WnbQQq1e" role="2OqNvi">
                                   <ref role="3Tt5mk" to="x27k:L2WnbQO2tQ" resolve="kind" />
@@ -6401,7 +6401,7 @@
                         <node concept="10Nm6u" id="11s6SFtcUtI" role="3uHU7w" />
                         <node concept="2OqwBi" id="11s6SFtcHAJ" role="3uHU7B">
                           <node concept="37vLTw" id="11s6SFtcH0r" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1MdOvoQtBwt" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1OF" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="11s6SFtcTDF" role="2OqNvi">
                             <ref role="3Tt5mk" to="x27k:L2WnbQO2tQ" resolve="kind" />
@@ -6410,9 +6410,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1MdOvoQtBwt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1OF" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1MdOvoQtBwu" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1OG" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7577,7 +7577,7 @@
                         <node concept="2OqwBi" id="4fD91B_1$jp" role="3clFbG">
                           <node concept="2OqwBi" id="4fD91B_1$jq" role="2Oq$k0">
                             <node concept="37vLTw" id="4fD91B_1$jr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4fD91B_1$jw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1OH" resolve="it" />
                             </node>
                             <node concept="2Xjw5R" id="4fD91B_1$js" role="2OqNvi">
                               <node concept="1xMEDy" id="4fD91B_1$jt" role="1xVPHs">
@@ -7591,9 +7591,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4fD91B_1$jw" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1OH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4fD91B_1$jx" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1OI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7629,7 +7629,7 @@
                         <node concept="1Wc70l" id="5CurKCJ9IXi" role="3clFbG">
                           <node concept="2OqwBi" id="5CurKCJ9JoS" role="3uHU7B">
                             <node concept="37vLTw" id="5CurKCJ9Jby" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4fD91B_1AOu" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1OJ" resolve="it" />
                             </node>
                             <node concept="3x8VRR" id="5CurKCJ9Lcp" role="2OqNvi" />
                           </node>
@@ -7646,7 +7646,7 @@
                               <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                               <node concept="2OqwBi" id="5CurKCJ7cge" role="37wK5m">
                                 <node concept="37vLTw" id="5CurKCJ7c46" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4fD91B_1AOu" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1OJ" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5CurKCJ7e5O" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7657,9 +7657,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4fD91B_1AOu" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1OJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4fD91B_1AOv" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1OK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8061,7 +8061,7 @@
                       <node concept="2d3UOw" id="7x9scHwr_Fi" role="3clFbG">
                         <node concept="2OqwBi" id="7x9scHwrzve" role="3uHU7B">
                           <node concept="37vLTw" id="7x9scHwrzoP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7x9scHwrzmf" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1OL" resolve="it" />
                           </node>
                           <node concept="2bSWHS" id="7x9scHwr$gV" role="2OqNvi" />
                         </node>
@@ -8079,9 +8079,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7x9scHwrzmf" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1OL" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7x9scHwrzmg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1OM" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8092,15 +8092,15 @@
                   <node concept="3clFbF" id="7x9scHwrNzf" role="3cqZAp">
                     <node concept="2OqwBi" id="7x9scHwrNTO" role="3clFbG">
                       <node concept="37vLTw" id="7x9scHwrNze" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7x9scHwrNx1" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1ON" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="5ZSJngDQOYZ" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7x9scHwrNx1" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1ON" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7x9scHwrNx2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1OO" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9742,7 +9742,7 @@
                                     <node concept="2OqwBi" id="5Nsk8EwoP9Q" role="3clFbG">
                                       <node concept="2OqwBi" id="5Nsk8EwoOkF" role="2Oq$k0">
                                         <node concept="37vLTw" id="5Nsk8EwoNJJ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5Nsk8EwoNHg" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1OP" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="5Nsk8EwoOLF" role="2OqNvi">
                                           <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
@@ -9754,9 +9754,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5Nsk8EwoNHg" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1OP" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="5Nsk8EwoNHh" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1OQ" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -10403,15 +10403,15 @@
                             <node concept="3clFbF" id="4b64BCbACeJ" role="3cqZAp">
                               <node concept="2OqwBi" id="4b64BCbACiL" role="3clFbG">
                                 <node concept="37vLTw" id="4b64BCbACeI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4b64BCbACbd" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1OR" resolve="it" />
                                 </node>
                                 <node concept="1$rogu" id="4b64BCbACGv" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4b64BCbACbd" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1OR" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4b64BCbACbe" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1OS" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -12454,7 +12454,7 @@
                                     <node concept="2OqwBi" id="12X7ie76$xq" role="1m5AlR">
                                       <node concept="2OqwBi" id="12X7ie76$xr" role="2Oq$k0">
                                         <node concept="37vLTw" id="12X7ie76$xs" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="12X7ie76$xW" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1OT" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="12X7ie76E4a" role="2OqNvi">
                                           <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -12479,7 +12479,7 @@
                                 <node concept="2OqwBi" id="12X7ie76$xz" role="2Oq$k0">
                                   <node concept="2OqwBi" id="12X7ie76$x$" role="2Oq$k0">
                                     <node concept="37vLTw" id="12X7ie76$x_" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="12X7ie76$xW" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1OT" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="12X7ie77YYf" role="2OqNvi">
                                       <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -12504,7 +12504,7 @@
                                     <node concept="2OqwBi" id="12X7ie76$xH" role="1m5AlR">
                                       <node concept="2OqwBi" id="12X7ie76$xI" role="2Oq$k0">
                                         <node concept="37vLTw" id="12X7ie76$xJ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="12X7ie76$xW" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1OT" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="12X7ie76CMV" role="2OqNvi">
                                           <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -12532,7 +12532,7 @@
                           <node concept="2OqwBi" id="12X7ie76$xQ" role="2Oq$k0">
                             <node concept="2OqwBi" id="12X7ie76$xR" role="2Oq$k0">
                               <node concept="37vLTw" id="12X7ie76$xS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="12X7ie76$xW" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1OT" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="12X7ie76BxG" role="2OqNvi">
                                 <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -12549,9 +12549,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="12X7ie76$xW" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1OT" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="12X7ie76$xX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1OU" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12635,7 +12635,7 @@
                                     <node concept="2OqwBi" id="12X7ie75peo" role="1m5AlR">
                                       <node concept="2OqwBi" id="12X7ie75pep" role="2Oq$k0">
                                         <node concept="37vLTw" id="12X7ie75peq" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="12X7ie75peU" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1OV" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="12X7ie75per" role="2OqNvi">
                                           <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -12660,7 +12660,7 @@
                                 <node concept="2OqwBi" id="12X7ie75pex" role="2Oq$k0">
                                   <node concept="2OqwBi" id="12X7ie75pey" role="2Oq$k0">
                                     <node concept="37vLTw" id="12X7ie75pez" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="12X7ie75peU" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1OV" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="12X7ie75pe$" role="2OqNvi">
                                       <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -12685,7 +12685,7 @@
                                     <node concept="2OqwBi" id="12X7ie75peF" role="1m5AlR">
                                       <node concept="2OqwBi" id="12X7ie75peG" role="2Oq$k0">
                                         <node concept="37vLTw" id="12X7ie75peH" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="12X7ie75peU" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1OV" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="12X7ie75peI" role="2OqNvi">
                                           <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -12713,7 +12713,7 @@
                           <node concept="2OqwBi" id="12X7ie75peO" role="2Oq$k0">
                             <node concept="2OqwBi" id="12X7ie75peP" role="2Oq$k0">
                               <node concept="37vLTw" id="12X7ie75peQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="12X7ie75peU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1OV" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="12X7ie75peR" role="2OqNvi">
                                 <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -12730,9 +12730,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="12X7ie75peU" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1OV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="12X7ie75peV" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1OW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -13852,7 +13852,7 @@
                               <node concept="2OqwBi" id="6nn59B_v$up" role="3clFbG">
                                 <node concept="2OqwBi" id="6nn59B_urr_" role="2Oq$k0">
                                   <node concept="37vLTw" id="6nn59B_up9N" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6nn59B_un0i" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1OX" resolve="it" />
                                   </node>
                                   <node concept="2yIwOk" id="6nn59B_utIX" role="2OqNvi" />
                                 </node>
@@ -13864,9 +13864,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6nn59B_un0i" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1OX" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6nn59B_un0j" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1OY" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -14039,7 +14039,7 @@
                       <node concept="2d3UOw" id="6nn59B$mFWI" role="3clFbG">
                         <node concept="2OqwBi" id="6nn59B$mFWJ" role="3uHU7B">
                           <node concept="37vLTw" id="6nn59B$mFWK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6nn59B$mFWR" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1OZ" resolve="it" />
                           </node>
                           <node concept="2bSWHS" id="6nn59B$mFWL" role="2OqNvi" />
                         </node>
@@ -14067,9 +14067,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6nn59B$mFWR" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1OZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6nn59B$mFWS" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1P0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -14080,15 +14080,15 @@
                   <node concept="3clFbF" id="6nn59B$mFWW" role="3cqZAp">
                     <node concept="2OqwBi" id="6nn59B$mFWX" role="3clFbG">
                       <node concept="37vLTw" id="6nn59B$mFWY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6nn59B$mFX0" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1P1" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="5ZSJngDQTuK" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6nn59B$mFX0" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1P1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6nn59B$mFX1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1P2" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl
index 89ff4472235..035db3e1c5f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl
@@ -48,7 +48,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -116,7 +116,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -136,7 +135,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
@@ -178,7 +176,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -209,7 +207,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/models/com/mbeddr/core/modules/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/models/com/mbeddr/core/modules/pluginSolution/plugin.mps
index 199d10c50c7..585f652e7f7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/models/com/mbeddr/core/modules/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/models/com/mbeddr/core/modules/pluginSolution/plugin.mps
@@ -3,11 +3,11 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -70,7 +70,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -82,6 +82,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -115,7 +116,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -146,7 +147,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -299,7 +299,7 @@
                                     <node concept="2OqwBi" id="5CXUFNJG1iX" role="3clFbG">
                                       <node concept="2OqwBi" id="5CXUFNJFWJ7" role="2Oq$k0">
                                         <node concept="37vLTw" id="5CXUFNJFWhq" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5CXUFNJFTzk" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2_8" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="5CXUFNJFZoj" role="2OqNvi">
                                           <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -313,9 +313,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5CXUFNJFTzk" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2_8" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="5CXUFNJFTzl" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2_9" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -326,7 +326,7 @@
                                 <node concept="3clFbF" id="3uPd3F$gbb5" role="3cqZAp">
                                   <node concept="2OqwBi" id="5CXUFNJGb3i" role="3clFbG">
                                     <node concept="37vLTw" id="5CXUFNJG9AC" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3uPd3F$gbba" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2_a" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="5CXUFNJGcNS" role="2OqNvi">
                                       <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
@@ -334,9 +334,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3uPd3F$gbba" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2_a" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3uPd3F$gbbb" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2_b" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd
index 787fd0568ea..084fe709eba 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.modules.pluginSolution" uuid="2f5ede3a-118b-4ca2-b175-49dc47318deb" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.modules.pluginSolution" uuid="2f5ede3a-118b-4ca2-b175-49dc47318deb" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -25,11 +24,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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
@@ -81,7 +80,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
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 9948f923fda..ab022ca574b 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
@@ -34,7 +34,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -86,7 +86,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -107,7 +106,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/generator/template/main@generator.mps
index cc7f14df180..a76b9b2483b 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/generator/template/main@generator.mps
@@ -14,7 +14,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/behavior.mps
index f44ec038f42..9177245a627 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/behavior.mps
@@ -127,7 +127,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -195,7 +195,7 @@
         <child id="1160998896846" name="condition" index="1gVkn0" />
         <child id="1160998916832" name="message" index="1gVpfI" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -214,7 +214,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -254,6 +254,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -371,7 +372,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -420,7 +421,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -526,7 +526,7 @@
                               <node concept="2qgKlT" id="jipk886TWD" role="2OqNvi">
                                 <ref role="37wK5l" node="jipk886TYE" resolve="findInstances" />
                                 <node concept="37vLTw" id="jipk886TWE" role="37wK5m">
-                                  <ref role="3cqZAo" node="jipk886TWN" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Ph" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -551,9 +551,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="jipk886TWN" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ph" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="jipk886TWO" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pi" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -590,7 +590,7 @@
                         <node concept="3clFbF" id="jipk886TX5" role="3cqZAp">
                           <node concept="37vLTI" id="jipk886TX6" role="3clFbG">
                             <node concept="37vLTw" id="jipk886TX7" role="37vLTx">
-                              <ref role="3cqZAo" node="jipk886TXd" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Pj" resolve="it" />
                             </node>
                             <node concept="2OqwBi" id="jipk886TX8" role="37vLTJ">
                               <node concept="37vLTw" id="jipk886TX9" role="2Oq$k0">
@@ -610,9 +610,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="jipk886TXd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="jipk886TXe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -887,7 +887,7 @@
                         <node concept="2OqwBi" id="xRVdUh_ztX" role="2Oq$k0">
                           <node concept="2OqwBi" id="xRVdUh_yEl" role="2Oq$k0">
                             <node concept="37vLTw" id="xRVdUh_yhP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2WJ8cS_wlwA" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Pl" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="xRVdUh_zbd" role="2OqNvi">
                               <ref role="3Tt5mk" to="tp25:1Bs_61$ngwB" resolve="modelRef" />
@@ -914,9 +914,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2WJ8cS_wlwA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2WJ8cS_wlwB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pm" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1100,7 +1100,7 @@
                     <node concept="3clFbF" id="5Lx3sEEu_Gq" role="3cqZAp">
                       <node concept="2OqwBi" id="5Lx3sEEuNNh" role="3clFbG">
                         <node concept="37vLTw" id="5Lx3sEEuNH8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5Lx3sEEuhAK" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Pn" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5Lx3sEEuSFx" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:3wj3sjzQUV1" resolve="getModule" />
@@ -1108,9 +1108,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5Lx3sEEuhAK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pn" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5Lx3sEEuhAL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Po" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1271,7 +1271,7 @@
                     <node concept="3clFbF" id="6Xk4NhNZAz7" role="3cqZAp">
                       <node concept="2OqwBi" id="6Xk4NhNZAz8" role="3clFbG">
                         <node concept="37vLTw" id="6Xk4NhNZAz9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Xk4NhNZAzb" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Pp" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6Xk4NhNZAza" role="2OqNvi">
                           <ref role="37wK5l" to="w1kc:~Language.getGenerators()" resolve="getGenerators" />
@@ -1279,9 +1279,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Xk4NhNZAzb" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pp" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Xk4NhNZAzc" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pq" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1306,7 +1306,7 @@
                     <node concept="3clFbF" id="6Xk4NhNZG3P" role="3cqZAp">
                       <node concept="2OqwBi" id="6Xk4NhNZG3Q" role="3clFbG">
                         <node concept="37vLTw" id="6Xk4NhNZG3R" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Xk4NhNZG3T" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Pr" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6Xk4NhNZG3S" role="2OqNvi">
                           <ref role="37wK5l" to="w1kc:~Generator.getOwnTemplateModels()" resolve="getOwnTemplateModels" />
@@ -1314,9 +1314,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Xk4NhNZG3T" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pr" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Xk4NhNZG3U" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ps" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1501,7 +1501,7 @@
                         <node concept="3JPx81" id="6Xk4NhNZKJ$" role="2OqNvi">
                           <node concept="2OqwBi" id="6Xk4NhNZKJ_" role="25WWJ7">
                             <node concept="37vLTw" id="6Xk4NhNZKJA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Xk4NhNZKJC" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Pt" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6Xk4NhNZOwz" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
@@ -1511,9 +1511,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Xk4NhNZKJC" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pt" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Xk4NhNZKJD" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Pu" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1588,7 +1588,7 @@
                         <node concept="3clFbF" id="6Xk4NhNTLKI" role="3cqZAp">
                           <node concept="2OqwBi" id="6Xk4NhNTLKJ" role="3clFbG">
                             <node concept="37vLTw" id="6Xk4NhNTLKK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Xk4NhNTLKO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Pv" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="6Xk4NhNTLKL" role="2OqNvi">
                               <node concept="1xMEDy" id="6Xk4NhNTLKM" role="1xVPHs">
@@ -1600,9 +1600,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Xk4NhNTLKO" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Pv" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Xk4NhNTLKP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Pw" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1853,7 +1853,7 @@
                     <node concept="3clFbF" id="6Xk4NhNoKNU" role="3cqZAp">
                       <node concept="2OqwBi" id="6Xk4NhNoKNV" role="3clFbG">
                         <node concept="37vLTw" id="6Xk4NhNoKNW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Xk4NhNoKO0" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Px" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="6Xk4NhNoKNX" role="2OqNvi">
                           <node concept="1xMEDy" id="6Xk4NhNoKNY" role="1xVPHs">
@@ -1865,9 +1865,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Xk4NhNoKO0" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Px" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Xk4NhNoKO1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Py" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2108,7 +2108,7 @@
                     <node concept="3clFbF" id="6Xk4NhNnOCp" role="3cqZAp">
                       <node concept="2OqwBi" id="6Xk4NhNnOCq" role="3clFbG">
                         <node concept="37vLTw" id="6Xk4NhNnOCr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Xk4NhNnOCt" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Pz" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6Xk4NhNnOCs" role="2OqNvi">
                           <ref role="3TsBF5" to="79wq:jipk886TUC" resolve="prefix" />
@@ -2116,9 +2116,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Xk4NhNnOCt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Pz" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Xk4NhNnOCu" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1P$" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2179,7 +2179,7 @@
                                     <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
                                     <node concept="2OqwBi" id="2gZjCUSDqxg" role="37wK5m">
                                       <node concept="37vLTw" id="6Xk4NhNnTuS" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6Xk4NhNnTuT" resolve="lanPref" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1P_" resolve="lanPref" />
                                       </node>
                                       <node concept="liA8E" id="2gZjCUSDsaW" role="2OqNvi">
                                         <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
@@ -2189,7 +2189,7 @@
                                         <node concept="3cpWsd" id="2gZjCUSDujq" role="37wK5m">
                                           <node concept="2OqwBi" id="2gZjCUSDsI3" role="3uHU7B">
                                             <node concept="37vLTw" id="2gZjCUSDsvf" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6Xk4NhNnTuT" resolve="lanPref" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1P_" resolve="lanPref" />
                                             </node>
                                             <node concept="liA8E" id="2gZjCUSDtHY" role="2OqNvi">
                                               <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
@@ -2208,7 +2208,7 @@
                           </node>
                           <node concept="2OqwBi" id="2gZjCUSDoL9" role="3clFbw">
                             <node concept="37vLTw" id="2gZjCUSDoLa" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Xk4NhNnTuT" resolve="lanPref" />
+                              <ref role="3cqZAo" node="2SR9xrsN1P_" resolve="lanPref" />
                             </node>
                             <node concept="liA8E" id="2gZjCUSDoLb" role="2OqNvi">
                               <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
@@ -2228,7 +2228,7 @@
                                     <node concept="liA8E" id="2gZjCUSDyDk" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                       <node concept="37vLTw" id="2gZjCUSDySz" role="37wK5m">
-                                        <ref role="3cqZAo" node="6Xk4NhNnTuT" resolve="lanPref" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1P_" resolve="lanPref" />
                                       </node>
                                     </node>
                                   </node>
@@ -2246,9 +2246,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Xk4NhNnTuT" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1P_" role="1bW2Oz">
                         <property role="TrG5h" value="lanPref" />
-                        <node concept="2jxLKc" id="6Xk4NhNnTuU" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1PA" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2612,7 +2612,7 @@
                     <node concept="3clFbF" id="7XtTpp8W6R4" role="3cqZAp">
                       <node concept="2OqwBi" id="7XtTpp8W6R5" role="3clFbG">
                         <node concept="37vLTw" id="7XtTpp8W6R6" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7XtTpp8W6R9" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1PB" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7XtTpp8W6R7" role="2OqNvi">
                           <ref role="37wK5l" to="z1c3:~Project.isProjectModule(org.jetbrains.mps.openapi.module.SModule)" resolve="isProjectModule" />
@@ -2623,9 +2623,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7XtTpp8W6R9" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1PB" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7XtTpp8W6Ra" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1PC" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2926,14 +2926,14 @@
                       <node concept="1rXfSq" id="6Xk4NhNTlkT" role="3clFbG">
                         <ref role="37wK5l" node="6Xk4NhNTbZU" resolve="isRelevantGeneratorFragment" />
                         <node concept="37vLTw" id="6Xk4NhNTlkU" role="37wK5m">
-                          <ref role="3cqZAo" node="6Xk4NhNTlkV" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1PD" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Xk4NhNTlkV" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1PD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Xk4NhNTlkW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1PE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3008,7 +3008,7 @@
                                 <node concept="2OqwBi" id="79i$vAY5Z62" role="2Oq$k0">
                                   <node concept="2yIwOk" id="79i$vAY5Z63" role="2OqNvi" />
                                   <node concept="37vLTw" id="6Xk4NhNSsf4" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6Xk4NhNSs0X" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1PF" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -3020,9 +3020,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Xk4NhNSs0X" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1PF" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Xk4NhNSs0Y" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1PG" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3856,7 +3856,7 @@
                               <node concept="3clFbF" id="3RllbSabCbZ" role="3cqZAp">
                                 <node concept="37vLTI" id="3RllbSabCUg" role="3clFbG">
                                   <node concept="37vLTw" id="3RllbSabCZK" role="37vLTx">
-                                    <ref role="3cqZAo" node="3RllbSabtmL" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1PH" resolve="it" />
                                   </node>
                                   <node concept="2OqwBi" id="3RllbSabCfa" role="37vLTJ">
                                     <node concept="37vLTw" id="3RllbSabCbY" role="2Oq$k0">
@@ -3885,7 +3885,7 @@
                               <node concept="2OqwBi" id="3RllbSabuHO" role="3uHU7B">
                                 <node concept="2OqwBi" id="3RllbSabtvQ" role="2Oq$k0">
                                   <node concept="37vLTw" id="3RllbSabtsg" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3RllbSabtmL" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1PH" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="3RllbSabtMv" role="2OqNvi">
                                     <node concept="1xMEDy" id="3RllbSabtMx" role="1xVPHs">
@@ -3906,9 +3906,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3RllbSabtmL" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1PH" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3RllbSabtmM" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1PI" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4340,7 +4340,7 @@
                             </node>
                             <node concept="2OqwBi" id="5OmAtC8BvFU" role="2GsD0m">
                               <node concept="37vLTw" id="5OmAtC8BvFV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5OmAtC8BvG3" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1PJ" resolve="it" />
                               </node>
                               <node concept="2Rf3mk" id="5OmAtC8BvFW" role="2OqNvi">
                                 <node concept="1xMEDy" id="5OmAtC8BvFX" role="1xVPHs">
@@ -4352,9 +4352,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5OmAtC8BvG3" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1PJ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5OmAtC8BvG4" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1PK" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5273,7 +5273,7 @@
                             <node concept="2OqwBi" id="5stuwjV5CBy" role="2Oq$k0">
                               <node concept="2OqwBi" id="5stuwjV5BPF" role="2Oq$k0">
                                 <node concept="37vLTw" id="5stuwjV5BK3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5stuwjV5BxO" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1PL" resolve="it" />
                                 </node>
                                 <node concept="I4A8Y" id="5stuwjV5Ckz" role="2OqNvi" />
                               </node>
@@ -5291,9 +5291,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5stuwjV5BxO" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1PL" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5stuwjV5BxP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1PM" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5341,7 +5341,7 @@
                               <node concept="2OqwBi" id="5stuwjV5NzI" role="2Oq$k0">
                                 <node concept="2OqwBi" id="5stuwjV5NzJ" role="2Oq$k0">
                                   <node concept="37vLTw" id="5stuwjV5NzK" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5stuwjV5MSd" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1PN" resolve="it" />
                                   </node>
                                   <node concept="I4A8Y" id="5stuwjV5NzL" role="2OqNvi" />
                                 </node>
@@ -5360,9 +5360,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5stuwjV5MSd" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1PN" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5stuwjV5MSe" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1PO" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5429,7 +5429,7 @@
                             <node concept="2OqwBi" id="79i$vAY5Z66" role="2Oq$k0">
                               <node concept="2yIwOk" id="79i$vAY5Z67" role="2OqNvi" />
                               <node concept="37vLTw" id="5stuwjVxJKQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5stuwjV5TsI" resolve="n" />
+                                <ref role="3cqZAo" node="2SR9xrsN1PR" resolve="n" />
                               </node>
                             </node>
                           </node>
@@ -5460,7 +5460,7 @@
                             <node concept="2qgKlT" id="5stuwjVxCUl" role="2OqNvi">
                               <ref role="37wK5l" node="5stuwjVbBxx" resolve="matched" />
                               <node concept="37vLTw" id="5stuwjVxCUm" role="37wK5m">
-                                <ref role="3cqZAo" node="5stuwjV5TsI" resolve="n" />
+                                <ref role="3cqZAo" node="2SR9xrsN1PR" resolve="n" />
                               </node>
                             </node>
                           </node>
@@ -5475,21 +5475,21 @@
                                     </node>
                                     <node concept="2OqwBi" id="5stuwjVxPfF" role="37wK5m">
                                       <node concept="37vLTw" id="5stuwjVxP1X" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5stuwjVxNTa" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1PP" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="5stuwjVxPOc" role="2OqNvi">
                                         <ref role="37wK5l" node="5stuwjVslJQ" resolve="resultLabel" />
                                         <node concept="37vLTw" id="5stuwjVxQeE" role="37wK5m">
-                                          <ref role="3cqZAo" node="5stuwjV5TsI" resolve="n" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1PR" resolve="n" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5stuwjVxNTa" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1PP" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="5stuwjVxNTb" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1PQ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -5507,9 +5507,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5stuwjV5TsI" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1PR" role="1bW2Oz">
                   <property role="TrG5h" value="n" />
-                  <node concept="2jxLKc" id="5stuwjV5TsJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1PS" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5543,7 +5543,7 @@
                       <node concept="37vLTI" id="5stuwjV6dlt" role="3clFbG">
                         <node concept="2OqwBi" id="5stuwjV6dyg" role="37vLTx">
                           <node concept="37vLTw" id="5stuwjV6drq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5stuwjV5YJd" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1PT" resolve="it" />
                           </node>
                           <node concept="3AY5_j" id="5stuwjV6egV" role="2OqNvi" />
                         </node>
@@ -5561,7 +5561,7 @@
                       <node concept="37vLTI" id="5stuwjV6g7D" role="3clFbG">
                         <node concept="2OqwBi" id="5stuwjV6glO" role="37vLTx">
                           <node concept="37vLTw" id="5stuwjV6ge9" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5stuwjV5YJd" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1PT" resolve="it" />
                           </node>
                           <node concept="3AV6Ez" id="5stuwjV6gZb" role="2OqNvi" />
                         </node>
@@ -5581,9 +5581,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5stuwjV5YJd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1PT" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5stuwjV5YJe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1PU" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5700,7 +5700,7 @@
                   <node concept="3clFbF" id="5stuwjVxAXP" role="3cqZAp">
                     <node concept="2OqwBi" id="5stuwjVxAXQ" role="3clFbG">
                       <node concept="37vLTw" id="5stuwjVxAXR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5stuwjVxAXU" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1PV" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="5stuwjVxAXS" role="2OqNvi">
                         <ref role="37wK5l" node="5stuwjVbNOa" resolve="matches" />
@@ -5711,9 +5711,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5stuwjVxAXU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1PV" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5stuwjVxAXV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1PW" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6007,7 +6007,7 @@
                           <node concept="3clFbF" id="4$VRXeHFJah" role="3cqZAp">
                             <node concept="2OqwBi" id="4$VRXeHFJcW" role="3clFbG">
                               <node concept="37vLTw" id="4$VRXeHFJag" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4$VRXeHFJ6z" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1PX" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="4$VRXeHFJ$e" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:4$VRXeHdE9I" resolve="update" />
@@ -6018,9 +6018,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4$VRXeHFJ6z" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1PX" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4$VRXeHFJ6$" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1PY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6098,7 +6098,7 @@
                         <node concept="2OqwBi" id="79i$vAY5Z4L" role="2Oq$k0">
                           <node concept="2yIwOk" id="79i$vAY5Z4M" role="2OqNvi" />
                           <node concept="37vLTw" id="4$VRXeHFNlV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4$VRXeHF_5_" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1PZ" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -6120,15 +6120,15 @@
                       <node concept="2qgKlT" id="4$VRXeHFQ2e" role="2OqNvi">
                         <ref role="37wK5l" node="4$VRXeHdIpS" resolve="calculate" />
                         <node concept="37vLTw" id="4$VRXeHFQl1" role="37wK5m">
-                          <ref role="3cqZAo" node="4$VRXeHF_5_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1PZ" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4$VRXeHF_5_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1PZ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4$VRXeHF_5A" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Q0" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/editor.mps
index 8e0aaf702ed..6ae74ab3cbe 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/editor.mps
@@ -65,7 +65,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -139,7 +139,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -199,7 +199,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/structure.mps
index a93ee0c124a..96c9a396705 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/structure.mps
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/typesystem.mps
index 872d6022b6d..2700c82c918 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/languageModels/typesystem.mps
@@ -63,7 +63,7 @@
       </concept>
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -76,6 +76,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -114,7 +115,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -133,7 +134,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -172,7 +172,7 @@
                   <node concept="3clFbF" id="3_hE8hnXdUq" role="3cqZAp">
                     <node concept="2OqwBi" id="3_hE8hnXdUr" role="3clFbG">
                       <node concept="37vLTw" id="3_hE8hnXdUs" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3_hE8hnXdUu" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Q1" resolve="it" />
                       </node>
                       <node concept="liA8E" id="3_hE8hnXdUt" role="2OqNvi">
                         <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
@@ -180,9 +180,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3_hE8hnXdUu" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Q1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3_hE8hnXdUv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Q2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -294,7 +294,7 @@
                       <node concept="3clFbF" id="6Xk4NhOCkZ4" role="3cqZAp">
                         <node concept="2OqwBi" id="6Xk4NhOClbM" role="3clFbG">
                           <node concept="37vLTw" id="6Xk4NhOCkZ3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Xk4NhOCkPJ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Q3" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6Xk4NhOCmy7" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -305,9 +305,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Xk4NhOCkPJ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Q3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Xk4NhOCkPK" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Q4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps
index f85d133bd76..49c48dd69cf 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps
@@ -169,7 +169,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -319,7 +319,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -359,7 +359,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -413,6 +413,7 @@
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1046929382682558545" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteralType" flags="ig" index="9cv3F" />
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -494,7 +495,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
@@ -512,7 +513,7 @@
         <child id="946964771156066623" name="applyTo" index="yHkDe" />
         <child id="946964771156066622" name="createEditor" index="yHkDf" />
       </concept>
-      <concept id="946964771156066594" name="jetbrains.mps.execution.settings.structure.IPersistentPropertyHolder" flags="ng" index="yHkDj">
+      <concept id="946964771156066594" name="jetbrains.mps.execution.settings.structure.IPersistentPropertyHolder" flags="ngI" index="yHkDj">
         <child id="946964771156066595" name="persistentProperty" index="yHkDi" />
       </concept>
       <concept id="946964771156066597" name="jetbrains.mps.execution.settings.structure.CheckProperties_Function" flags="ig" index="yHkDk" />
@@ -544,7 +545,7 @@
         <reference id="946964771156066333" name="persistentConfiguration" index="yHkHG" />
       </concept>
       <concept id="946964771156066557" name="jetbrains.mps.execution.settings.structure.TemplatePersistentConfigurationType" flags="in" index="yHkIc" />
-      <concept id="946964771156905617" name="jetbrains.mps.execution.settings.structure.PersistentConfigurationAssistent" flags="ng" index="yIonw">
+      <concept id="946964771156905617" name="jetbrains.mps.execution.settings.structure.PersistentConfigurationAssistent" flags="ngI" index="yIonw">
         <reference id="946964771156905618" name="configuration" index="yIonz" />
       </concept>
       <concept id="2722628536111969416" name="jetbrains.mps.execution.settings.structure.GridBagConstraints" flags="nn" index="1rwKMM">
@@ -625,7 +626,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -667,7 +668,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -2282,7 +2282,7 @@
                                 <node concept="2OqwBi" id="IdL6SRui01" role="3uHU7B">
                                   <node concept="2OqwBi" id="IdL6SRugT3" role="2Oq$k0">
                                     <node concept="37vLTw" id="IdL6SRugxU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="IdL6SRugnM" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2_c" resolve="it" />
                                     </node>
                                     <node concept="2yIwOk" id="IdL6SRuhBW" role="2OqNvi" />
                                   </node>
@@ -2294,9 +2294,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="IdL6SRugnM" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2_c" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="IdL6SRugnN" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2_d" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4920,7 +4920,7 @@
                     <node concept="3clFbF" id="5ibmMvPfV31" role="3cqZAp">
                       <node concept="2OqwBi" id="5ibmMvPfV3n" role="3clFbG">
                         <node concept="37vLTw" id="5ibmMvPfV32" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5ibmMvPfV2Z" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_e" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5ibmMvPfV3t" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -4928,9 +4928,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5ibmMvPfV2Z" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2_e" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5ibmMvPfV30" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2_f" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4970,7 +4970,7 @@
                     <node concept="3clFbF" id="5ibmMvPfV7h" role="3cqZAp">
                       <node concept="2OqwBi" id="5ibmMvPfV7i" role="3clFbG">
                         <node concept="37vLTw" id="5ibmMvPfV7j" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5ibmMvPfV7l" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_g" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5ibmMvPfV7x" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:2kkumeGQBhZ" resolve="lib" />
@@ -4978,9 +4978,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5ibmMvPfV7l" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2_g" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5ibmMvPfV7m" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2_h" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6609,7 +6609,7 @@
                             <node concept="2OqwBi" id="5t9vNAcgQHP" role="3clFbG">
                               <node concept="2OqwBi" id="5t9vNAcgQHQ" role="2Oq$k0">
                                 <node concept="37vLTw" id="5t9vNAcgQHR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5t9vNAcgQHV" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2_i" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5t9vNAcgQHS" role="2OqNvi">
                                   <ref role="37wK5l" to="ahli:7RiewQ_lHPf" resolve="referencedImplModules" />
@@ -6623,9 +6623,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5t9vNAcgQHV" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2_i" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5t9vNAcgQHW" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2_j" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6823,7 +6823,7 @@
                           <node concept="3clFbF" id="41uJ_cWmsRF" role="3cqZAp">
                             <node concept="2OqwBi" id="41uJ_cWmmaS" role="3clFbG">
                               <node concept="37vLTw" id="41uJ_cWmtsg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="41uJ_cWmsi8" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2_k" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="41uJ_cWmniN" role="2OqNvi">
                                 <ref role="37wK5l" to="qd6m:2MbfxrZIa1M" resolve="actsAsMainFunction" />
@@ -6831,9 +6831,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="41uJ_cWmsi8" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2_k" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="41uJ_cWmsi9" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2_l" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6918,7 +6918,7 @@
                             <node concept="2OqwBi" id="41uJ_cWlOox" role="3clFbG">
                               <node concept="2OqwBi" id="41uJ_cWlOoy" role="2Oq$k0">
                                 <node concept="37vLTw" id="41uJ_cWlOoz" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="41uJ_cWlOoB" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2_m" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="41uJ_cWlOo$" role="2OqNvi">
                                   <ref role="37wK5l" to="ahli:7RiewQ_lHPf" resolve="referencedImplModules" />
@@ -6932,9 +6932,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="41uJ_cWlOoB" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2_m" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="41uJ_cWlOoC" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2_n" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd
index 42ebca64487..839655558b8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.runconfiguration.pluginSolution" uuid="a51f87f6-b1c1-4962-bffc-cddc26760c2d" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.runconfiguration.pluginSolution" uuid="a51f87f6-b1c1-4962-bffc-cddc26760c2d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -37,7 +36,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -49,7 +48,7 @@
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/actions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/actions.mps
index 3859d8d5279..75edaba83dc 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/actions.mps
@@ -2,7 +2,7 @@
 <model ref="r:f272d0cc-a1f0-4f70-8316-377a652766ba(com.mbeddr.core.statements.actions)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
@@ -90,7 +90,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps
index 9054d5391e9..f65ecc20b10 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps
@@ -69,7 +69,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -186,7 +186,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -202,7 +202,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -238,6 +238,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -372,7 +373,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -424,7 +425,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
@@ -533,7 +533,7 @@
                         <node concept="3clFbF" id="6viY8n1_mr1" role="3cqZAp">
                           <node concept="2OqwBi" id="6viY8n1_mr2" role="3clFbG">
                             <node concept="37vLTw" id="6viY8n1_mr3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6viY8n1_mr5" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Q6" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6viY8n1_mr4" role="2OqNvi">
                               <ref role="3TsBF5" to="c4fa:41KMvfcgiZ1" resolve="isInvisible" />
@@ -541,9 +541,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6viY8n1_mr5" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Q6" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6viY8n1_mr6" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Q7" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -554,7 +554,7 @@
                       <node concept="3clFbF" id="6viY8n1uoEZ" role="3cqZAp">
                         <node concept="2OqwBi" id="6viY8n1uqgP" role="3clFbG">
                           <node concept="37vLTw" id="6viY8n1uoEY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6viY8n1uklc" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Q8" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6viY8n1_ax9" role="2OqNvi">
                             <ref role="37wK5l" node="3LB9aGm4C$b" resolve="getContributedLocalVariables" />
@@ -565,9 +565,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6viY8n1uklc" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Q8" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6viY8n1ukld" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Q9" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -723,7 +723,7 @@
                       <node concept="2OqwBi" id="3MW0c4RnJgu" role="3clFbG">
                         <node concept="2OqwBi" id="3MW0c4RnFeu" role="2Oq$k0">
                           <node concept="37vLTw" id="3MW0c4RnFer" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MW0c4RnFeo" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Qa" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="79i$vAY5Zcm" role="2OqNvi" />
                         </node>
@@ -735,9 +735,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3MW0c4RnFeo" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Qa" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3MW0c4RnFep" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Qb" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -836,7 +836,7 @@
                         <node concept="2OqwBi" id="79i$vAY5ZcV" role="2Oq$k0">
                           <node concept="2yIwOk" id="79i$vAY5ZcW" role="2OqNvi" />
                           <node concept="37vLTw" id="3uNea_OzEIw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3uNea_OzzPs" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Qc" resolve="it" />
                           </node>
                         </node>
                         <node concept="3O6GUB" id="79i$vAY5ZcX" role="2OqNvi">
@@ -848,9 +848,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3uNea_OzzPs" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Qc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3uNea_OzzPt" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Qd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1156,7 +1156,7 @@
                     <node concept="2OqwBi" id="60PbHqSgvAk" role="3clFbG">
                       <node concept="2OqwBi" id="60PbHqSgvAl" role="2Oq$k0">
                         <node concept="37vLTw" id="60PbHqSgvAm" role="2Oq$k0">
-                          <ref role="3cqZAo" node="60PbHqSgvAq" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Qe" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="60PbHqSgvAn" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1171,9 +1171,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="60PbHqSgvAq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Qe" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="60PbHqSgvAr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Qf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1782,15 +1782,15 @@
                           </node>
                           <node concept="TSZUe" id="58TcxRGwffx" role="2OqNvi">
                             <node concept="37vLTw" id="58TcxRGwfYa" role="25WWJ7">
-                              <ref role="3cqZAo" node="58TcxRGvXJd" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Qg" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="58TcxRGvXJd" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Qg" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="58TcxRGvXJe" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Qh" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2117,7 +2117,7 @@
                       <node concept="d57v9" id="7RHXOmy7$Kf" role="3clFbG">
                         <node concept="2OqwBi" id="7RHXOmy7F2c" role="37vLTx">
                           <node concept="37vLTw" id="7RHXOmy7_5c" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7RHXOmy7yjD" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Qo" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7RHXOmy7G47" role="2OqNvi">
                             <ref role="37wK5l" node="7RHXOmy7DC1" resolve="renderReadable" />
@@ -2138,9 +2138,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="7RHXOmy7z0r" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="7RHXOmy7yjD" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Qo" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7RHXOmy7yjE" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Qp" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="7RHXOmy7ytz" role="1MDeny">
@@ -3520,6 +3520,27 @@
       </node>
       <node concept="3Tm1VV" id="BsHjoDSP5G" role="1B3o_S" />
     </node>
+    <node concept="13i0hz" id="4jmgM1fPOMN" role="13h7CS">
+      <property role="TrG5h" value="getTextualRepresentation" />
+      <ref role="13i0hy" to="tpcu:fB3l80ylIb" resolve="getTextualRepresentation" />
+      <node concept="3Tm1VV" id="4jmgM1fPOMO" role="1B3o_S" />
+      <node concept="3clFbS" id="4jmgM1fPOMR" role="3clF47">
+        <node concept="3clFbF" id="4jmgM1fPPO7" role="3cqZAp">
+          <node concept="2OqwBi" id="4jmgM1fPST7" role="3clFbG">
+            <node concept="2OqwBi" id="4jmgM1fPQh$" role="2Oq$k0">
+              <node concept="13iPFW" id="4jmgM1fPPO6" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4jmgM1fPSG8" role="2OqNvi">
+                <ref role="3Tt5mk" to="c4fa:7uLL3Mf3Z6z" resolve="textblock" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="4jmgM1fPT9J" role="2OqNvi">
+              <ref role="37wK5l" to="hwgx:6byLOcR3jNg" resolve="asTextString" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="4jmgM1fPOMS" role="3clF45" />
+    </node>
     <node concept="13i0hz" id="BsHjoDSP6A" role="13h7CS">
       <property role="TrG5h" value="getBracketColor" />
       <ref role="13i0hy" to="hwgx:BsHjoDRsTa" resolve="getBracketColor" />
@@ -4338,7 +4359,7 @@
                     <node concept="3y3z36" id="8PQYyuaeOT" role="3clFbG">
                       <node concept="2OqwBi" id="8PQYyuaeOW" role="3uHU7B">
                         <node concept="37vLTw" id="8PQYyuaeOX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="8PQYytSc3F" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Qq" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="8PQYyuaeOY" role="2OqNvi">
                           <ref role="37wK5l" node="8PQYytRYFO" resolve="type" />
@@ -4351,9 +4372,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="8PQYytSc3F" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Qq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="8PQYytSc3G" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Qr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4408,7 +4429,7 @@
                     <node concept="3clFbC" id="8PQYytVnOX" role="3clFbG">
                       <node concept="2OqwBi" id="8PQYytVnOZ" role="3uHU7B">
                         <node concept="37vLTw" id="8PQYytVnP0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="8PQYytVn_3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Qs" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="8PQYytVnP1" role="2OqNvi">
                           <ref role="37wK5l" node="8PQYytRYFO" resolve="type" />
@@ -4421,9 +4442,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="8PQYytVn_3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Qs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="8PQYytVn_4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Qt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4457,7 +4478,7 @@
                     <node concept="3clFbC" id="8PQYytSkZ5" role="3clFbG">
                       <node concept="2OqwBi" id="8PQYytSkZ7" role="3uHU7B">
                         <node concept="37vLTw" id="8PQYytSkZ8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="8PQYytSgY0" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Qu" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="8PQYytSkZ9" role="2OqNvi">
                           <ref role="37wK5l" node="8PQYytRYFO" resolve="type" />
@@ -4470,9 +4491,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="8PQYytSgY0" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Qu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="8PQYytSgY1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Qv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4792,7 +4813,7 @@
                       <node concept="d57v9" id="33WP3ANCWV_" role="3clFbG">
                         <node concept="2OqwBi" id="33WP3ANCWVA" role="37vLTx">
                           <node concept="37vLTw" id="33WP3ANCWVB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="33WP3ANCWVI" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Qw" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="33WP3ANCWVC" role="2OqNvi">
                             <ref role="37wK5l" node="7RHXOmy7DC1" resolve="renderReadable" />
@@ -4813,9 +4834,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="33WP3ANCWVH" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="33WP3ANCWVI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Qw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="33WP3ANCWVJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Qx" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="33WP3ANCWVK" role="1MDeny">
@@ -5079,7 +5100,7 @@
                             <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
                           </node>
                           <node concept="37vLTw" id="2GzcfKRG2EN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2GzcfKRG2EU" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Qy" resolve="it" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="2GzcfKRG2EP" role="37vLTJ">
@@ -5097,9 +5118,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="2GzcfKRG2ET" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="2GzcfKRG2EU" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Qy" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2GzcfKRG2EV" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Qz" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="2GzcfKRG2EW" role="1MDeny">
@@ -5424,7 +5445,7 @@
                       <node concept="3cpWs3" id="1fwYPhx7LRp" role="37vLTx">
                         <node concept="2OqwBi" id="1fwYPhx4Sir" role="3uHU7w">
                           <node concept="37vLTw" id="1fwYPhx56bE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1fwYPhx4Zq5" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Q$" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="1fwYPhx4SS2" role="2OqNvi">
                             <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -5444,7 +5465,7 @@
                               </node>
                               <node concept="2OqwBi" id="1fwYPhx4ZOT" role="3uHU7B">
                                 <node concept="37vLTw" id="1fwYPhx4ZOU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1fwYPhx4Zq5" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Q$" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="1fwYPhx4ZOV" role="2OqNvi" />
                               </node>
@@ -5455,9 +5476,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1fwYPhx4Zq5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Q$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1fwYPhx4Zq6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Q_" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/constraints.mps
index c6bbd683fd5..c0ec3c2fd45 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/constraints.mps
@@ -70,7 +70,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -144,7 +144,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/dataFlow.mps
index d0f39ee7e62..fd3f845d440 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/dataFlow.mps
@@ -81,7 +81,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -171,7 +171,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 afddc75cf5f..8f705824303 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
@@ -7,7 +7,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="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" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -372,6 +372,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -521,7 +522,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -2690,7 +2690,7 @@
                         <node concept="3clFbF" id="7FkLcyyQKyR" role="3cqZAp">
                           <node concept="2OqwBi" id="7FkLcyyQKyS" role="3clFbG">
                             <node concept="37vLTw" id="7FkLcyyQKyT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7FkLcyyQKyW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1QA" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="7FkLcyyQKyU" role="2OqNvi">
                               <node concept="chp4Y" id="7FkLcyyQKyV" role="cj9EA">
@@ -2700,9 +2700,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7FkLcyyQKyW" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1QA" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7FkLcyyQKyX" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1QB" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2734,7 +2734,7 @@
                         <node concept="3clFbF" id="7FkLcyyQKza" role="3cqZAp">
                           <node concept="2OqwBi" id="7FkLcyyQKzb" role="3clFbG">
                             <node concept="37vLTw" id="7FkLcyyQKzc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7FkLcyyQKzf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1QC" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="7FkLcyyQKzd" role="2OqNvi">
                               <node concept="chp4Y" id="7FkLcyyQKze" role="cj9EA">
@@ -2744,9 +2744,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7FkLcyyQKzf" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1QC" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7FkLcyyQKzg" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1QD" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2781,7 +2781,7 @@
                           <node concept="3clFbF" id="7FkLcyyQKzv" role="3cqZAp">
                             <node concept="2OqwBi" id="7FkLcyyQKzw" role="3clFbG">
                               <node concept="37vLTw" id="7FkLcyyQKzx" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7FkLcyyQKz$" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1QE" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7FkLcyyQKzy" role="2OqNvi">
                                 <node concept="chp4Y" id="7FkLcyyQKzz" role="cj9EA">
@@ -2791,9 +2791,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7FkLcyyQKz$" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1QE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7FkLcyyQKz_" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1QF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2850,7 +2850,7 @@
                         <node concept="3clFbF" id="7FkLcyyQKzQ" role="3cqZAp">
                           <node concept="2OqwBi" id="7FkLcyyQKzR" role="3clFbG">
                             <node concept="37vLTw" id="7FkLcyyQKzS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7FkLcyyQKzV" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1QG" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="7FkLcyyQKzT" role="2OqNvi">
                               <node concept="chp4Y" id="7FkLcyyQKzU" role="cj9EA">
@@ -2860,9 +2860,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7FkLcyyQKzV" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1QG" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7FkLcyyQKzW" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1QH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/findUsages.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/findUsages.mps
index bff1310799a..9e9559cc7eb 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/findUsages.mps
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -75,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/intentions.mps
index bc3596f6a20..680b8e85aa5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/intentions.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions" version="0" />
@@ -89,7 +89,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -105,6 +105,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -203,7 +204,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -218,7 +219,6 @@
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -1077,7 +1077,7 @@
                         <node concept="1Wc70l" id="3bfDwHbRApL" role="3clFbG">
                           <node concept="2OqwBi" id="3bfDwHbET$D" role="3uHU7B">
                             <node concept="37vLTw" id="3bfDwHbETqg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3bfDwHbETaw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1QI" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="3bfDwHbEVjV" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:3bfDwHbEns0" resolve="canWrap" />
@@ -1086,7 +1086,7 @@
                           </node>
                           <node concept="17QLQc" id="2cvVnUv9dJ$" role="3uHU7w">
                             <node concept="37vLTw" id="4OlFaNL4VbH" role="3uHU7B">
-                              <ref role="3cqZAo" node="3bfDwHbETaw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1QI" resolve="it" />
                             </node>
                             <node concept="35c_gC" id="2cvVnUv9bSO" role="3uHU7w">
                               <ref role="35c_gD" to="mj1l:3bfDwHbElen" resolve="IExpressionWrapper" />
@@ -1095,9 +1095,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3bfDwHbETaw" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1QI" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3bfDwHbETax" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1QJ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1108,7 +1108,7 @@
                     <node concept="3clFbF" id="7x2kTsyuSk0" role="3cqZAp">
                       <node concept="2OqwBi" id="7x2kTsyuSBF" role="3clFbG">
                         <node concept="37vLTw" id="7x2kTsyuSjZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7x2kTsyuRLD" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1QK" resolve="it" />
                         </node>
                         <node concept="2Zo12i" id="7x2kTsyuTAQ" role="2OqNvi">
                           <node concept="chp4Y" id="7x2kTsyxDg4" role="2Zo12j">
@@ -1118,9 +1118,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7x2kTsyuRLD" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1QK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7x2kTsyuRLE" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1QL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/migration.mps
index 10f6e2e7147..ab52b7b51a5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/migration.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -60,7 +60,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -70,12 +70,13 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -150,7 +151,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -175,7 +176,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -245,7 +245,7 @@
                           <node concept="2OqwBi" id="1iWV611fiin" role="3clFbG">
                             <node concept="2OqwBi" id="1iWV611fiio" role="2Oq$k0">
                               <node concept="37vLTw" id="1iWV611fiip" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1iWV611fiit" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1QQ" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1iWV611fiiq" role="2OqNvi">
                                 <ref role="3Tt5mk" to="c4fa:2I09F8VK$gF" resolve="elsePart" />
@@ -259,9 +259,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1iWV611fiit" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1QQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1iWV611fiiu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1QR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -433,7 +433,7 @@
                           <node concept="2OqwBi" id="248Ay3uXMHa" role="3clFbG">
                             <node concept="2OqwBi" id="248Ay3uXMHb" role="2Oq$k0">
                               <node concept="37vLTw" id="248Ay3uXMHc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="248Ay3uXMHh" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1QS" resolve="it" />
                               </node>
                               <node concept="2Xjw5R" id="248Ay3uXMHd" role="2OqNvi">
                                 <node concept="1xMEDy" id="248Ay3uXMHe" role="1xVPHs">
@@ -447,9 +447,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="248Ay3uXMHh" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1QS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="248Ay3uXMHi" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1QT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -472,7 +472,7 @@
                           </node>
                           <node concept="2OqwBi" id="248Ay3uXAcZ" role="33vP2m">
                             <node concept="37vLTw" id="248Ay3uXBmD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="248Ay3uXsF9" resolve="forVarRef" />
+                              <ref role="3cqZAo" node="2SR9xrsN1QU" resolve="forVarRef" />
                             </node>
                             <node concept="2Xjw5R" id="248Ay3uXAd1" role="2OqNvi">
                               <node concept="1xMEDy" id="248Ay3uXAd2" role="1xVPHs">
@@ -502,7 +502,7 @@
                                       <node concept="36biLy" id="248Ay3uXJyR" role="28nt2d">
                                         <node concept="2OqwBi" id="248Ay3uXK3d" role="36biLW">
                                           <node concept="37vLTw" id="248Ay3uXJJf" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="248Ay3uXsF9" resolve="forVarRef" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1QU" resolve="forVarRef" />
                                           </node>
                                           <node concept="3TrEf2" id="248Ay3uXKsU" role="2OqNvi">
                                             <ref role="3Tt5mk" to="c4fa:3hOuikE_zo3" resolve="var" />
@@ -515,7 +515,7 @@
                                       <node concept="36biLy" id="248Ay3uXL3P" role="28nt2d">
                                         <node concept="2OqwBi" id="248Ay3uXLCN" role="36biLW">
                                           <node concept="37vLTw" id="248Ay3uXLfW" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="248Ay3uXsF9" resolve="forVarRef" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1QU" resolve="forVarRef" />
                                           </node>
                                           <node concept="3TrEf2" id="248Ay3uXM5r" role="2OqNvi">
                                             <ref role="3Tt5mk" to="c4fa:3hOuikE_rad" resolve="init" />
@@ -531,9 +531,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="248Ay3uXsF9" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1QU" role="1bW2Oz">
                       <property role="TrG5h" value="forVarRef" />
-                      <node concept="2jxLKc" id="248Ay3uXsFa" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1QV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -550,15 +550,15 @@
                       <node concept="3clFbF" id="248Ay3uXOvh" role="3cqZAp">
                         <node concept="2OqwBi" id="248Ay3uXODH" role="3clFbG">
                           <node concept="37vLTw" id="248Ay3uXOvg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="248Ay3uXOp2" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1QW" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="5ZSJngDQL8i" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="248Ay3uXOp2" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1QW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="248Ay3uXOp3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1QX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/plugin.mps
index 5eb758efc56..30519410f61 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:be293a79-c9de-44c7-848a-150147010751(com.mbeddr.core.statements.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="935bff03-e393-4547-a3a2-60335e0cad25" name="com.mbeddr.mpsutil.ccmenu" version="-1" />
     <use id="f92af8d7-1fae-4067-8109-17acf80f8e58" name="com.mbeddr.mpsutil.ccmenu.reftarget" version="-1" />
@@ -41,7 +41,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/refactorings.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/refactorings.mps
index 99142ac3e72..f9d62b89b40 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/refactorings.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/refactorings.mps
@@ -95,7 +95,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -111,7 +111,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -119,6 +119,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -204,7 +205,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -234,7 +235,6 @@
         <child id="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -806,7 +806,7 @@
                         </node>
                         <node concept="2OqwBi" id="5GBGtqczWlS" role="3uHU7B">
                           <node concept="37vLTw" id="5GBGtqczWlT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5GBGtqczWlV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1QM" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5GBGtqczWlU" role="2OqNvi">
                             <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
@@ -815,9 +815,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5GBGtqczWlV" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1QM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5GBGtqczWlW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1QN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/scripts.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/scripts.mps
index 09395a1ebd9..0d8b0055369 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/scripts.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" name="jetbrains.mps.lang.script" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -100,7 +100,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/textGen.mps
index 4237d7c0787..9b3e62998ae 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/textGen.mps
@@ -82,7 +82,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -171,7 +171,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/typesystem.mps
index 044c3d2f195..6e27a3806b0 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/typesystem.mps
@@ -109,7 +109,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,6 +131,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -298,7 +299,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -325,7 +326,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -861,7 +861,7 @@
                     <node concept="3clFbF" id="2I09F8VKNSO" role="3cqZAp">
                       <node concept="2OqwBi" id="2I09F8VKNSQ" role="3clFbG">
                         <node concept="37vLTw" id="2I09F8VKNSP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2I09F8VKNSM" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1QO" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="2I09F8VKNSV" role="2OqNvi">
                           <node concept="chp4Y" id="2I09F8VKNSX" role="cj9EA">
@@ -871,9 +871,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2I09F8VKNSM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1QO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2I09F8VKNSN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1QP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/models/com/mbeddr/core/statements/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/models/com/mbeddr/core/statements/pluginSolution/plugin.mps
index 8c952c3757c..90ff42dfb07 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/models/com/mbeddr/core/statements/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/models/com/mbeddr/core/statements/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
   </languages>
   <imports>
@@ -20,7 +20,7 @@
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd
index 6b519607b22..1c09051a562 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.statements.pluginSolution" uuid="9c4a5d6b-5d27-41ec-8b86-70f2a7bb9cb2" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.statements.pluginSolution" uuid="9c4a5d6b-5d27-41ec-8b86-70f2a7bb9cb2" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</dependency>
   </dependencies>
@@ -20,7 +19,7 @@
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl
index 6fe93cb6fa3..7172a7eedfe 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -40,7 +39,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -64,7 +63,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -127,7 +126,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
index ced3310126f..b45526eb82a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
@@ -181,6 +181,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -335,7 +336,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -394,7 +394,7 @@
                         <node concept="10Nm6u" id="LUz4xAqAtS" role="3uHU7w" />
                         <node concept="2OqwBi" id="LUz4xAqAtK" role="3uHU7B">
                           <node concept="37vLTw" id="LUz4xAqAtJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LUz4xAqAtG" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1QY" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="LUz4xAqAtO" role="2OqNvi">
                             <ref role="3Tt5mk" to="clbe:7D99css6O0w" resolve="init" />
@@ -403,9 +403,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="LUz4xAqAtG" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1QY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="LUz4xAqAtH" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1QZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -594,7 +594,7 @@
                         <node concept="1PxgMI" id="4a$W5l26w5H" role="3clFbG">
                           <node concept="2OqwBi" id="4a$W5l26w5I" role="1m5AlR">
                             <node concept="37vLTw" id="4a$W5l26w5J" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4a$W5l26w5L" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1R0" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4a$W5l26w5K" role="2OqNvi">
                               <ref role="37wK5l" to="hwgx:70kXLV4LLzy" resolve="target" />
@@ -606,9 +606,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4a$W5l26w5L" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1R0" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4a$W5l26w5M" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1R1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1045,7 +1045,7 @@
                             <node concept="2OqwBi" id="5zgShfbeacs" role="3cqZAk">
                               <node concept="2OqwBi" id="5zgShfbeact" role="2Oq$k0">
                                 <node concept="37vLTw" id="5zgShfbeacu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5zgShfbeacG" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1R2" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5zgShfbeacv" role="2OqNvi">
                                   <ref role="3Tt5mk" to="clbe:7D99css6O0w" resolve="init" />
@@ -1060,7 +1060,7 @@
                         <node concept="2OqwBi" id="5zgShfbeacx" role="3clFbw">
                           <node concept="2OqwBi" id="5zgShfbeacy" role="2Oq$k0">
                             <node concept="37vLTw" id="5zgShfbeacz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5zgShfbeacG" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1R2" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5zgShfbeac$" role="2OqNvi">
                               <ref role="3Tt5mk" to="clbe:7D99css6O0w" resolve="init" />
@@ -1076,7 +1076,7 @@
                                 <ref role="37wK5l" to="xlxw:~BigInteger.valueOf(long)" resolve="valueOf" />
                                 <node concept="2OqwBi" id="5zgShfbeacD" role="37wK5m">
                                   <node concept="37vLTw" id="5zgShfbeacE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5zgShfbeacG" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1R2" resolve="it" />
                                   </node>
                                   <node concept="2bSWHS" id="5zgShfbeacF" role="2OqNvi" />
                                 </node>
@@ -1086,9 +1086,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5zgShfbeacG" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1R2" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5zgShfbeacH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1R3" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1100,7 +1100,7 @@
                       <node concept="1eOMI4" id="5zgShfbeacM" role="3clFbG">
                         <node concept="10QFUN" id="5zgShfbeacN" role="1eOMHV">
                           <node concept="37vLTw" id="5zgShfbeacO" role="10QFUP">
-                            <ref role="3cqZAo" node="5zgShfbeacQ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1R4" resolve="it" />
                           </node>
                           <node concept="3uibUv" id="6kPQpqHy5zv" role="10QFUM">
                             <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
@@ -1109,9 +1109,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5zgShfbeacQ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1R4" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5zgShfbeacR" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1R5" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1135,7 +1135,7 @@
                               <ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
                             </node>
                             <node concept="37vLTw" id="6kPQpqHxUD5" role="10QFUP">
-                              <ref role="3cqZAo" node="5zgShfbbdjo" resolve="a" />
+                              <ref role="3cqZAo" node="2SR9xrsN1R6" resolve="a" />
                             </node>
                           </node>
                         </node>
@@ -1147,7 +1147,7 @@
                                 <ref role="3uigEE" to="xlxw:~BigInteger" resolve="BigInteger" />
                               </node>
                               <node concept="37vLTw" id="6kPQpqHxX78" role="10QFUP">
-                                <ref role="3cqZAo" node="5zgShfbbdjq" resolve="b" />
+                                <ref role="3cqZAo" node="2SR9xrsN1R8" resolve="b" />
                               </node>
                             </node>
                           </node>
@@ -1155,13 +1155,13 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5zgShfbbdjo" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1R6" role="1bW2Oz">
                     <property role="TrG5h" value="a" />
-                    <node concept="2jxLKc" id="5zgShfbbdjp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1R7" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="5zgShfbbdjq" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1R8" role="1bW2Oz">
                     <property role="TrG5h" value="b" />
-                    <node concept="2jxLKc" id="5zgShfbbdjr" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1R9" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="5zgShfbbdjs" role="2Dq5b$">
@@ -1367,11 +1367,11 @@
                                   <node concept="3clFbF" id="5aZFu$7GKMT" role="3cqZAp">
                                     <node concept="3clFbC" id="5aZFu$7GKMU" role="3clFbG">
                                       <node concept="37vLTw" id="5aZFu$7GKMV" role="3uHU7w">
-                                        <ref role="3cqZAo" node="5aZFu$7GKN1" resolve="m" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Rc" resolve="m" />
                                       </node>
                                       <node concept="2OqwBi" id="5aZFu$7GKMW" role="3uHU7B">
                                         <node concept="37vLTw" id="5aZFu$7GKMX" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5aZFu$7GKMZ" resolve="a" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Ra" resolve="a" />
                                         </node>
                                         <node concept="3TrEf2" id="5aZFu$7GKMY" role="2OqNvi">
                                           <ref role="3Tt5mk" to="clbe:3DiW6qrFRdx" resolve="element" />
@@ -1380,18 +1380,18 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5aZFu$7GKMZ" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1Ra" role="1bW2Oz">
                                   <property role="TrG5h" value="a" />
-                                  <node concept="2jxLKc" id="5aZFu$7GKN0" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1Rb" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5aZFu$7GKN1" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Rc" role="1bW2Oz">
                         <property role="TrG5h" value="m" />
-                        <node concept="2jxLKc" id="5aZFu$7GKN2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Rd" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1409,7 +1409,7 @@
                   <node concept="3clFbF" id="5aZFu$7G_RZ" role="3cqZAp">
                     <node concept="2OqwBi" id="5aZFu$7G_S0" role="3clFbG">
                       <node concept="37vLTw" id="5aZFu$7G_S1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5aZFu$7G_S4" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Re" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5aZFu$7G_S2" role="2OqNvi">
                         <node concept="chp4Y" id="5aZFu$7G_S3" role="cj9EA">
@@ -1419,9 +1419,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5aZFu$7G_S4" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Re" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5aZFu$7G_S5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Rf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1826,7 +1826,7 @@
                       <node concept="3clFbF" id="F16UoWz633" role="3cqZAp">
                         <node concept="2OqwBi" id="F16UoWz634" role="3clFbG">
                           <node concept="37vLTw" id="F16UoWz635" role="2Oq$k0">
-                            <ref role="3cqZAo" node="F16UoWz5Ru" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Rg" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="F16UoWz636" role="2OqNvi">
                             <node concept="chp4Y" id="F16UoWz637" role="cj9EA">
@@ -1836,9 +1836,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="F16UoWz5Ru" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Rg" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="F16UoWz5Rv" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Rh" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1854,7 +1854,7 @@
                     <node concept="3clFbF" id="F16UoWyVOZ" role="3cqZAp">
                       <node concept="2OqwBi" id="F16UoWyVP0" role="3clFbG">
                         <node concept="37vLTw" id="F16UoWyVP1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="F16UoWyVLy" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Ri" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="F16UoWyVP2" role="2OqNvi">
                           <node concept="chp4Y" id="F16UoWyVP3" role="cj9EA">
@@ -1864,9 +1864,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="F16UoWyVLy" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ri" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="F16UoWyVLz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Rj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1915,7 +1915,7 @@
                       <node concept="3clFbF" id="6IWRcVOLkXe" role="3cqZAp">
                         <node concept="2OqwBi" id="6IWRcVOLkXf" role="3clFbG">
                           <node concept="37vLTw" id="6IWRcVOLkXg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6IWRcVOLkXj" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Rk" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="6IWRcVOLkXh" role="2OqNvi">
                             <node concept="chp4Y" id="6IWRcVOLkXi" role="cj9EA">
@@ -1925,9 +1925,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6IWRcVOLkXj" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Rk" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6IWRcVOLkXk" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Rl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2098,7 +2098,7 @@
                         <node concept="3clFbF" id="61lw97FupFT" role="3cqZAp">
                           <node concept="2OqwBi" id="61lw97FupGf" role="3clFbG">
                             <node concept="37vLTw" id="61lw97FupFU" role="2Oq$k0">
-                              <ref role="3cqZAo" node="61lw97FupFR" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Rm" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4vA5g9hZ0Vg" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -2106,9 +2106,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="61lw97FupFR" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Rm" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="61lw97FupFS" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Rn" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2459,7 +2459,7 @@
                         </node>
                         <node concept="2OqwBi" id="6YSWAhTKzqt" role="1m5AlR">
                           <node concept="37vLTw" id="6YSWAhTKzqu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6YSWAhTKzqw" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Ro" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6YSWAhTKzqv" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:7jSUHHvkAph" resolve="referencedModuleContent" />
@@ -2468,9 +2468,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6YSWAhTKzqw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ro" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6YSWAhTKzqx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Rp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2965,7 +2965,7 @@
                         <node concept="2OqwBi" id="F16UoWyCdW" role="3clFbG">
                           <node concept="2OqwBi" id="F16UoWy_Bo" role="2Oq$k0">
                             <node concept="37vLTw" id="F16UoWy_qQ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="F16UoWy_b8" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Rq" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="F16UoWyB8t" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2995,9 +2995,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="F16UoWy_b8" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Rq" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="F16UoWy_b9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Rr" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3094,7 +3094,7 @@
                                 <node concept="2OqwBi" id="5ZYJ6Xxc9Xx" role="3clFbG">
                                   <node concept="2OqwBi" id="5ZYJ6Xxc9Xy" role="2Oq$k0">
                                     <node concept="37vLTw" id="5ZYJ6Xxc9Xz" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5ZYJ6Xxc9XA" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Rs" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5ZYJ6Xxc9X$" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -3106,9 +3106,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5ZYJ6Xxc9XA" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Rs" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5ZYJ6Xxc9XB" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Rt" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3118,13 +3118,13 @@
                           <node concept="3clFbS" id="5ZYJ6Xxc9XE" role="1bW5cS">
                             <node concept="3clFbF" id="5ZYJ6Xxc9XF" role="3cqZAp">
                               <node concept="37vLTw" id="5ZYJ6Xxc9XG" role="3clFbG">
-                                <ref role="3cqZAo" node="5ZYJ6Xxc9XH" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ru" resolve="it" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5ZYJ6Xxc9XH" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Ru" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5ZYJ6Xxc9XI" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Rv" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="1nlBCl" id="5ZYJ6Xxc9XJ" role="2S7zOq">
@@ -3914,7 +3914,7 @@
                       <node concept="2OqwBi" id="4ISByPp5EHs" role="3clFbG">
                         <node concept="2OqwBi" id="4ISByPp5EHt" role="2Oq$k0">
                           <node concept="37vLTw" id="4ISByPp5EHu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ISByPp5EHy" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Rw" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4ISByPp7wbw" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -3928,9 +3928,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4ISByPp5EHy" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Rw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4ISByPp5EHz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Rx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3960,7 +3960,7 @@
                           </node>
                           <node concept="2OqwBi" id="4ISByPp5Gbl" role="1m5AlR">
                             <node concept="37vLTw" id="4ISByPp5Gbm" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4ISByPp5Gbp" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ry" resolve="it" />
                             </node>
                             <node concept="3JvlWi" id="4ISByPp5Gbn" role="2OqNvi" />
                           </node>
@@ -3971,9 +3971,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4ISByPp5Gbp" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ry" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4ISByPp5Gbq" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Rz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4033,7 +4033,7 @@
                       <node concept="2OqwBi" id="4ISByPp7sJi" role="3clFbG">
                         <node concept="2OqwBi" id="4ISByPp7sJj" role="2Oq$k0">
                           <node concept="37vLTw" id="4ISByPp7sJk" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ISByPp7sJo" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1R$" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4ISByPp7vGu" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -4047,9 +4047,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4ISByPp7sJo" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1R$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4ISByPp7sJp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1R_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4818,7 +4818,7 @@
                                     <node concept="BsUDl" id="6h7l0fOFW$N" role="3clFbG">
                                       <ref role="37wK5l" node="1c_2vnOMqdJ" resolve="collectTypes" />
                                       <node concept="37vLTw" id="6h7l0fOFWG2" role="37wK5m">
-                                        <ref role="3cqZAo" node="6h7l0fOFWug" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1RA" resolve="it" />
                                       </node>
                                       <node concept="37vLTw" id="6h7l0fOFWUH" role="37wK5m">
                                         <ref role="3cqZAo" node="1c_2vnOMqdy" resolve="result" />
@@ -4826,9 +4826,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6h7l0fOFWug" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1RA" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6h7l0fOFWuh" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1RB" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -4904,7 +4904,7 @@
                                 <node concept="BsUDl" id="1c_2vnOMyTh" role="3clFbG">
                                   <ref role="37wK5l" node="1c_2vnOMqdJ" resolve="collectTypes" />
                                   <node concept="37vLTw" id="1c_2vnOMyXu" role="37wK5m">
-                                    <ref role="3cqZAo" node="1c_2vnOMyQq" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1RC" resolve="it" />
                                   </node>
                                   <node concept="37vLTw" id="1c_2vnOMz4F" role="37wK5m">
                                     <ref role="3cqZAo" node="1c_2vnOMqdy" resolve="result" />
@@ -4912,9 +4912,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1c_2vnOMyQq" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1RC" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1c_2vnOMyQr" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1RD" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
index a053e148a7d..ec9a7ce16ca 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
@@ -85,7 +85,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,6 +127,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -188,7 +189,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -210,7 +211,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -805,7 +805,7 @@
                             <node concept="1eOMI4" id="5CkU_dHihbj" role="3fr31v">
                               <node concept="2OqwBi" id="5CkU_dHihbk" role="1eOMHV">
                                 <node concept="37vLTw" id="5CkU_dHihbl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHihbn" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1RE" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5CkU_dHihbm" role="2OqNvi">
                                   <ref role="3TsBF5" to="clbe:6QawkaIMrjd" resolve="transparent" />
@@ -815,9 +815,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHihbn" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1RE" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHihbo" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1RF" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/dataFlow.mps
index a01e570e145..f6003b43906 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/dataFlow.mps
@@ -57,7 +57,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -71,7 +71,7 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -106,7 +106,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
index 62e35252f84..948576db198 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
@@ -28,7 +28,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -105,15 +105,15 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -140,7 +140,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -156,7 +156,7 @@
         <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ng" index="3EoQpk">
+      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ngI" index="3EoQpk">
         <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
@@ -174,12 +174,12 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -187,7 +187,7 @@
       </concept>
       <concept id="1163613822479" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Abstract_editedNode" flags="nn" index="3GMtW1" />
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="6918029743850363447" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_targetNode" flags="ng" index="1NM5Ph" />
@@ -261,12 +261,13 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -329,7 +330,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -338,7 +339,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -1290,7 +1290,7 @@
                       <node concept="3clFbF" id="2cvVnUv6ByN" role="3cqZAp">
                         <node concept="1PxgMI" id="2cvVnUv6ByO" role="3clFbG">
                           <node concept="37vLTw" id="2cvVnUv6ByP" role="1m5AlR">
-                            <ref role="3cqZAo" node="2cvVnUv6ByQ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1RG" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="79i$vAY5ZtQ" role="3oSUPX">
                             <ref role="cht4Q" to="clbe:5yYXyc4Z0CJ" resolve="StructDeclaration" />
@@ -1298,9 +1298,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2cvVnUv6ByQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1RG" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2cvVnUv6ByR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1RH" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps
index d512aad9b43..3de4691178e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps
@@ -119,6 +119,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -249,7 +250,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -699,7 +699,7 @@
                         <node concept="2OqwBi" id="2xZlQ5e8rmu" role="3clFbG">
                           <node concept="2OqwBi" id="2xZlQ5e8rmv" role="2Oq$k0">
                             <node concept="37vLTw" id="2xZlQ5e8rmw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2xZlQ5e8rmz" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1RI" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2xZlQ5e8rmx" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -709,9 +709,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2xZlQ5e8rmz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1RI" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2xZlQ5e8rm$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1RJ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1171,7 +1171,7 @@
                                     <node concept="2OqwBi" id="5HHTCV_eRp_" role="3clFbG">
                                       <node concept="2OqwBi" id="5HHTCV_eRpA" role="2Oq$k0">
                                         <node concept="37vLTw" id="5HHTCV_eRpB" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5HHTCV_eRpF" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1RK" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="5HHTCV_eRpC" role="2OqNvi">
                                           <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
@@ -1185,9 +1185,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5HHTCV_eRpF" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1RK" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="5HHTCV_eRpG" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1RL" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1198,7 +1198,7 @@
                                 <node concept="3clFbF" id="5HHTCV_eRpK" role="3cqZAp">
                                   <node concept="3y3z36" id="5HHTCV_eRpL" role="3clFbG">
                                     <node concept="37vLTw" id="5HHTCV_eRpM" role="3uHU7w">
-                                      <ref role="3cqZAo" node="5HHTCV_eRpW" resolve="enumLiteral" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1RO" resolve="enumLiteral" />
                                     </node>
                                     <node concept="2OqwBi" id="5HHTCV_eRpN" role="3uHU7B">
                                       <node concept="1PxgMI" id="5HHTCV_eRpO" role="2Oq$k0">
@@ -1207,7 +1207,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="5HHTCV_eRpQ" role="1m5AlR">
                                           <node concept="37vLTw" id="5HHTCV_eRpR" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5HHTCV_eRpU" resolve="switchCase" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1RM" resolve="switchCase" />
                                           </node>
                                           <node concept="3TrEf2" id="5HHTCV_eRpS" role="2OqNvi">
                                             <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
@@ -1221,18 +1221,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5HHTCV_eRpU" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1RM" role="1bW2Oz">
                                 <property role="TrG5h" value="switchCase" />
-                                <node concept="2jxLKc" id="5HHTCV_eRpV" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1RN" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5HHTCV_eRpW" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1RO" role="1bW2Oz">
                       <property role="TrG5h" value="enumLiteral" />
-                      <node concept="2jxLKc" id="5HHTCV_eRpX" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1RP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1270,7 +1270,7 @@
                                   <ref role="2pIpSl" to="clbe:7D99css6O2S" resolve="literal" />
                                   <node concept="36biLy" id="5HHTCV_cSZM" role="28nt2d">
                                     <node concept="37vLTw" id="5HHTCV_cT_4" role="36biLW">
-                                      <ref role="3cqZAo" node="5HHTCV_csI9" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1RQ" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -1299,9 +1299,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5HHTCV_csI9" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1RQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5HHTCV_csIa" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1RR" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
index 314e90302cb..13a36fa4828 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -39,7 +39,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -81,7 +81,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/scripts.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/scripts.mps
index 0eb171c5c65..ab615f4a154 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/scripts.mps
@@ -13,7 +13,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
index dd2df525b5f..0aa36612495 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
@@ -2,8 +2,7 @@
 <model ref="r:61d840b4-12c1-49ea-b142-b2a1550a9b15(com.mbeddr.core.udt.structure)">
   <persistence version="9" />
   <languages>
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="mj1l" ref="r:c371cf98-dcc8-4a43-8eb8-8a8096de18b2(com.mbeddr.core.expressions.structure)" />
@@ -60,7 +59,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/textGen.mps
index 9997ca92037..fcb250e185c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/textGen.mps
@@ -66,7 +66,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -149,7 +149,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
index 5c6f47c8704..106e4b1f70e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
@@ -107,7 +107,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,6 +127,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -294,7 +295,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -319,7 +320,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -2268,7 +2268,7 @@
                           <node concept="22lmx$" id="7ya9dte7trE" role="3clFbG">
                             <node concept="2OqwBi" id="7ya9dte7tES" role="3uHU7w">
                               <node concept="37vLTw" id="7ya9dte7tAd" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ya9dte7rZl" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1RS" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7ya9dte7u7p" role="2OqNvi">
                                 <node concept="chp4Y" id="7ya9dte7ui5" role="cj9EA">
@@ -2278,7 +2278,7 @@
                             </node>
                             <node concept="2OqwBi" id="7ya9dte7sel" role="3uHU7B">
                               <node concept="37vLTw" id="7ya9dte7s8l" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ya9dte7rZl" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1RS" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7ya9dte7sA9" role="2OqNvi">
                                 <node concept="chp4Y" id="7ya9dte7sHH" role="cj9EA">
@@ -2289,9 +2289,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7ya9dte7rZl" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1RS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7ya9dte7rZm" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1RT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
index 1fdf90dd3ee..2ddc2057530 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.core.udt" uuid="efda956e-491e-4f00-ba14-36af2f213ecf" languageVersion="5" moduleVersion="4">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="languageModels" />
     </modelRoot>
   </models>
@@ -25,30 +25,10 @@
       </facets>
       <external-templates />
       <languageVersions>
-        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="5" />
-        <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
-        <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="2" />
         <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="5" />
-        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
-        <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
-        <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
-        <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
-        <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <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" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l: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: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" />
       </languageVersions>
       <dependencyVersions>
@@ -83,10 +63,8 @@
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
         <module reference="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="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -97,16 +75,13 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
-    <dependency reexport="false">cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -130,7 +105,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -154,7 +129,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -199,11 +174,8 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" 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" />
-    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -215,7 +187,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps
index 8500af6e4a6..d9201cedf6d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps
@@ -61,7 +61,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -69,13 +69,14 @@
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -113,7 +114,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -139,7 +140,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -179,7 +179,7 @@
                       <node concept="2OqwBi" id="4JYoVJbdI5t" role="3clFbG">
                         <node concept="2OqwBi" id="4JYoVJbdI5u" role="2Oq$k0">
                           <node concept="37vLTw" id="4JYoVJbdI5v" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4JYoVJbdI5$" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Tu" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="4JYoVJbdI5w" role="2OqNvi">
                             <node concept="1xMEDy" id="4JYoVJbdI5x" role="1xVPHs">
@@ -195,9 +195,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4JYoVJbdI5$" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Tu" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4JYoVJbdI5_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Tv" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -305,7 +305,7 @@
                             <node concept="2OqwBi" id="4JYoVJbcQIF" role="2Oq$k0">
                               <node concept="2OqwBi" id="4JYoVJbcQIG" role="2Oq$k0">
                                 <node concept="37vLTw" id="4JYoVJbcQIH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4JYoVJbcQIM" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Tw" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="4JYoVJbcQII" role="2OqNvi">
                                   <ref role="3Tt5mk" to="x27k:5ak6HMA0red" resolve="function" />
@@ -321,9 +321,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4JYoVJbcQIM" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Tw" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4JYoVJbcQIN" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Tx" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -354,7 +354,7 @@
                     <node concept="1rXfSq" id="4JYoVJbd8ID" role="3clFbG">
                       <ref role="37wK5l" node="4JYoVJbd1t4" resolve="checkFunctionForTestHelperCall" />
                       <node concept="37vLTw" id="4JYoVJbdg0v" role="37wK5m">
-                        <ref role="3cqZAo" node="4JYoVJbdfCl" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Ty" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="4JYoVJbd98a" role="37wK5m">
                         <ref role="3cqZAo" node="4JYoVJbcTdb" resolve="calledFunctions" />
@@ -362,9 +362,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4JYoVJbdfCl" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Ty" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4JYoVJbdfCm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Tz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -450,7 +450,7 @@
                             <node concept="2OqwBi" id="4JYoVJbdatE" role="2Oq$k0">
                               <node concept="2OqwBi" id="4JYoVJbdatF" role="2Oq$k0">
                                 <node concept="37vLTw" id="4JYoVJbdatG" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4JYoVJbdatL" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1T$" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="4JYoVJbdatH" role="2OqNvi">
                                   <ref role="3Tt5mk" to="x27k:5ak6HMA0red" resolve="function" />
@@ -466,9 +466,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4JYoVJbdatL" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1T$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4JYoVJbdatM" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1T_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -490,7 +490,7 @@
                     <node concept="1rXfSq" id="4JYoVJbddiR" role="3clFbG">
                       <ref role="37wK5l" node="4JYoVJbd1t4" resolve="checkFunctionForTestHelperCall" />
                       <node concept="37vLTw" id="4JYoVJbdds6" role="37wK5m">
-                        <ref role="3cqZAo" node="4JYoVJbddd$" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1TA" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="4JYoVJbddH_" role="37wK5m">
                         <ref role="3cqZAo" node="4JYoVJbd2od" resolve="result" />
@@ -498,9 +498,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4JYoVJbddd$" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1TA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4JYoVJbddd_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1TB" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
index d8645168628..fc3deef1032 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
@@ -131,7 +131,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -174,7 +174,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -263,7 +263,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="2880994019885263148" name="jetbrains.mps.lang.generator.structure.LoopMacroNamespaceAccessor" flags="ng" index="$GB7w">
@@ -329,7 +329,6 @@
         <child id="1167945861827" name="conditionFunction" index="3IZSJc" />
       </concept>
       <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
-        <property id="7430509679011668804" name="counterVarName" index="1qytDF" />
         <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
       </concept>
       <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
@@ -337,6 +336,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
         <child id="1200830928149" name="expression" index="2n6tg2" />
       </concept>
@@ -509,7 +509,7 @@
       <concept id="8551646674110484035" name="com.mbeddr.core.modules.structure.FunctionRefExpr" flags="ng" index="pF0ck">
         <reference id="8551646674110484037" name="function" index="pF0ci" />
       </concept>
-      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ng" index="2vgHxx">
+      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ngI" index="2vgHxx">
         <property id="2688792604368329410" name="overriddenCodeLocation" index="2vgHxy" />
         <property id="8360911601957765890" name="contextModelId" index="2_9mZf" />
         <property id="5114214484368231289" name="contextNodeId" index="1F55Q3" />
@@ -522,7 +522,7 @@
         <child id="6021475212426185244" name="arguments" index="BULBh" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -530,7 +530,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -689,7 +689,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="779128492853369165" name="jetbrains.mps.lang.core.structure.SideTransformInfo" flags="ng" index="1KehLL">
@@ -730,7 +730,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
@@ -781,7 +781,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -800,7 +799,7 @@
         <child id="4352487882080109573" name="win32Stmts" index="CXe2I" />
       </concept>
       <concept id="6074373273971874807" name="com.mbeddr.core.modules.gen.structure.MultiPlatformFunctionCall" flags="ng" index="1StdAS" />
-      <concept id="6074373273971446767" name="com.mbeddr.core.modules.gen.structure.IMultiPlatformConstruct" flags="ng" index="1Svl6w">
+      <concept id="6074373273971446767" name="com.mbeddr.core.modules.gen.structure.IMultiPlatformConstruct" flags="ngI" index="1Svl6w">
         <property id="6074373273971446769" name="othersHeader" index="1Svl6Y" />
         <property id="6074373273971446768" name="win32Header" index="1Svl6Z" />
       </concept>
@@ -5489,7 +5488,7 @@
                       <node concept="2OqwBi" id="44MAav8q0v" role="3clFbG">
                         <node concept="2OqwBi" id="44MAav8q0w" role="2Oq$k0">
                           <node concept="37vLTw" id="44MAav8q0x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="44MAav8q0B" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1SS" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="44MAav8q0y" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5523,9 +5522,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="44MAav8q0B" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1SS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="44MAav8q0C" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1ST" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5554,7 +5553,7 @@
                       <node concept="2OqwBi" id="68PB5rZ$Xmb" role="3clFbG">
                         <node concept="2OqwBi" id="68PB5rZ$Xmc" role="2Oq$k0">
                           <node concept="37vLTw" id="68PB5rZ$Xmd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="68PB5rZ$Xmn" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1SU" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="68PB5rZ$Xme" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5588,9 +5587,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="68PB5rZ$Xmn" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1SU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="68PB5rZ$Xmo" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1SV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5619,7 +5618,7 @@
                       <node concept="2OqwBi" id="62eEIqGz_1B" role="3clFbG">
                         <node concept="2OqwBi" id="62eEIqGz_1C" role="2Oq$k0">
                           <node concept="37vLTw" id="62eEIqGz_1D" role="2Oq$k0">
-                            <ref role="3cqZAo" node="62eEIqGz_1J" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1SW" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="62eEIqGz_1E" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5653,9 +5652,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="62eEIqGz_1J" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1SW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="62eEIqGz_1K" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1SX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5803,7 +5802,7 @@
                       <node concept="3clFbF" id="yGOuCrIZHT" role="3cqZAp">
                         <node concept="2OqwBi" id="yGOuCrIZHU" role="3clFbG">
                           <node concept="37vLTw" id="yGOuCrIZHV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="yGOuCrIZHX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1SY" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="yGOuCrIZHW" role="2OqNvi">
                             <ref role="3TsBF5" to="yz9a:7nMAuIoJbju" resolve="entrypoint" />
@@ -5811,9 +5810,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="yGOuCrIZHX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1SY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="yGOuCrIZHY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1SZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5836,7 +5835,7 @@
                     <node concept="2OqwBi" id="44MAav88w8" role="3clFbG">
                       <node concept="2OqwBi" id="44MAav86Kt" role="2Oq$k0">
                         <node concept="37vLTw" id="44MAav86zu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="44MAav86wE" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1T2" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="44MAav87DT" role="2OqNvi" />
                       </node>
@@ -5846,7 +5845,7 @@
                             <node concept="3clFbF" id="44MAav89h$" role="3cqZAp">
                               <node concept="2OqwBi" id="44MAav89lB" role="3clFbG">
                                 <node concept="37vLTw" id="44MAav89hz" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="44MAav89cE" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1T0" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="44MAav89tp" role="2OqNvi">
                                   <node concept="chp4Y" id="44MAav89yH" role="cj9EA">
@@ -5856,18 +5855,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="44MAav89cE" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1T0" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="44MAav89cF" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1T1" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="44MAav86wE" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1T2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="44MAav86wF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1T3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5948,7 +5947,7 @@
                         <node concept="2OqwBi" id="2dCF6FyPFRN" role="3clFbG">
                           <node concept="2OqwBi" id="2dCF6FyPE$z" role="2Oq$k0">
                             <node concept="37vLTw" id="2dCF6FyPEfu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2dCF6FyPE3W" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1T4" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2dCF6FyPF_G" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5973,9 +5972,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2dCF6FyPE3W" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1T4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2dCF6FyPE3X" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1T5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6032,7 +6031,7 @@
                         </node>
                         <node concept="2OqwBi" id="2dCF6FyLIcC" role="3uHU7B">
                           <node concept="37vLTw" id="2dCF6FyLIcD" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2dCF6FyLIcF" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1T6" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2dCF6FyLIcE" role="2OqNvi">
                             <ref role="3Tt5mk" to="k146:2lgwE2U3cEo" resolve="table" />
@@ -6041,9 +6040,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2dCF6FyLIcF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1T6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2dCF6FyLIcG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1T7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6058,7 +6057,7 @@
                       </node>
                       <node concept="2OqwBi" id="2dCF6FyLIcN" role="37vLTJ">
                         <node concept="37vLTw" id="2dCF6FyLIcO" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2dCF6FyLId6" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1T8" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2dCF6FyLIcP" role="2OqNvi">
                           <ref role="3Tt5mk" to="k146:2lgwE2U3cEo" resolve="table" />
@@ -6082,7 +6081,7 @@
                             <node concept="2OqwBi" id="2dCF6FyLIcY" role="25WWJ7">
                               <node concept="2OqwBi" id="2dCF6FyLIcZ" role="2Oq$k0">
                                 <node concept="37vLTw" id="2dCF6FyLId0" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2dCF6FyLId6" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1T8" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="2dCF6FyLId1" role="2OqNvi">
                                   <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
@@ -6098,7 +6097,7 @@
                       </node>
                       <node concept="2OqwBi" id="2dCF6FyLId3" role="37vLTJ">
                         <node concept="37vLTw" id="2dCF6FyLId4" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2dCF6FyLId6" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1T8" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2dCF6FyLId5" role="2OqNvi">
                           <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
@@ -6107,9 +6106,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2dCF6FyLId6" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1T8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2dCF6FyLId7" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1T9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6344,7 +6343,7 @@
                                     <node concept="3fqX7Q" id="7nMAuIoSNwt" role="3clFbG">
                                       <node concept="2OqwBi" id="7nMAuIoSNwv" role="3fr31v">
                                         <node concept="37vLTw" id="7nMAuIoSNww" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7nMAuIoSMy2" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Ta" resolve="it" />
                                         </node>
                                         <node concept="1mIQ4w" id="7nMAuIoSNwx" role="2OqNvi">
                                           <node concept="chp4Y" id="7nMAuIoSNwy" role="cj9EA">
@@ -6355,9 +6354,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="7nMAuIoSMy2" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1Ta" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7nMAuIoSMy3" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1Tb" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -6648,7 +6647,7 @@
                                     <node concept="3clFbF" id="3yL83DvFc2g" role="3cqZAp">
                                       <node concept="2OqwBi" id="3yL83DvFc2h" role="3clFbG">
                                         <node concept="37vLTw" id="3yL83DvFc2i" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3yL83DvFc2k" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1Tc" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="3yL83DvFc2j" role="2OqNvi">
                                           <ref role="3Tt5mk" to="yz9a:4VEDcE28GXU" resolve="testcase" />
@@ -6656,9 +6655,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3yL83DvFc2k" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1Tc" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3yL83DvFc2l" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1Td" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -6677,7 +6676,6 @@
                   </node>
                 </node>
                 <node concept="1WS0z7" id="VRzgMEbb3O" role="lGtFl">
-                  <property role="1qytDF" value="" />
                   <node concept="3JmXsc" id="VRzgMEbb3R" role="3Jn$fo">
                     <node concept="3clFbS" id="VRzgMEbb3S" role="2VODD2">
                       <node concept="3clFbF" id="VRzgMEbb3Y" role="3cqZAp">
@@ -6702,7 +6700,7 @@
                                   <node concept="3clFbF" id="VRzgMEbgWA" role="3cqZAp">
                                     <node concept="2OqwBi" id="6On3mjUeF8V" role="3clFbG">
                                       <node concept="37vLTw" id="6On3mjUeEi9" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="VRzgMEbgPj" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Te" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6On3mjUeI47" role="2OqNvi">
                                         <ref role="3Tt5mk" to="yz9a:4VEDcE28GXU" resolve="testcase" />
@@ -6710,9 +6708,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="VRzgMEbgPj" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1Te" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="VRzgMEbgPk" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1Tf" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -7139,7 +7137,6 @@
                 </node>
               </node>
               <node concept="1WS0z7" id="VRzgMEbwIm" role="lGtFl">
-                <property role="1qytDF" value="" />
                 <node concept="3JmXsc" id="VRzgMEbwIp" role="3Jn$fo">
                   <node concept="3clFbS" id="VRzgMEbwIq" role="2VODD2">
                     <node concept="3clFbF" id="VRzgMEbwIw" role="3cqZAp">
@@ -7266,7 +7263,7 @@
                     <node concept="2OqwBi" id="2PyooRI3AKe" role="3clFbG">
                       <node concept="2OqwBi" id="2PyooRI3AKf" role="2Oq$k0">
                         <node concept="37vLTw" id="2PyooRI3AKg" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="2PyooRI3AKh" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7291,7 +7288,7 @@
                     <node concept="2OqwBi" id="1m$ejqCcWY3" role="3clFbG">
                       <node concept="2OqwBi" id="1m$ejqCcWY4" role="2Oq$k0">
                         <node concept="37vLTw" id="1m$ejqCcWY5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="1m$ejqCcWY6" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7316,7 +7313,7 @@
                     <node concept="2OqwBi" id="68PB5rZp6vD" role="3clFbG">
                       <node concept="2OqwBi" id="68PB5rZp6vE" role="2Oq$k0">
                         <node concept="37vLTw" id="68PB5rZp6vF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="68PB5rZp6vG" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7341,7 +7338,7 @@
                     <node concept="2OqwBi" id="2PyooRI3DYG" role="3clFbG">
                       <node concept="2OqwBi" id="2PyooRI3DYH" role="2Oq$k0">
                         <node concept="37vLTw" id="2PyooRI3DYI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="2PyooRI3DYJ" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7366,7 +7363,7 @@
                     <node concept="2OqwBi" id="1qmB$fdAAns" role="3clFbG">
                       <node concept="2OqwBi" id="1qmB$fdA_8R" role="2Oq$k0">
                         <node concept="37vLTw" id="1qmB$fdA_4$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="1qmB$fdA_sO" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7391,7 +7388,7 @@
                     <node concept="2OqwBi" id="3juJO4ZQJG0" role="3clFbG">
                       <node concept="2OqwBi" id="3juJO4ZQBr0" role="2Oq$k0">
                         <node concept="37vLTw" id="3juJO4ZQ_ft" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="3juJO4ZQDOI" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7416,7 +7413,7 @@
                     <node concept="2OqwBi" id="5PZNJkfG07x" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfG07y" role="2Oq$k0">
                         <node concept="37vLTw" id="5PZNJkfG07z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="5PZNJkfG07$" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7441,7 +7438,7 @@
                     <node concept="2OqwBi" id="1m$ejqCKcPT" role="3clFbG">
                       <node concept="2OqwBi" id="1m$ejqCKcPU" role="2Oq$k0">
                         <node concept="37vLTw" id="1m$ejqCKcPV" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="1m$ejqCKcPW" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7466,7 +7463,7 @@
                     <node concept="2OqwBi" id="5PZNJkfFYmx" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfFYmy" role="2Oq$k0">
                         <node concept="37vLTw" id="5PZNJkfFYmz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="5PZNJkfFYm$" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7491,7 +7488,7 @@
                     <node concept="2OqwBi" id="3t4TFam4$FO" role="3clFbG">
                       <node concept="2OqwBi" id="3t4TFam4$FP" role="2Oq$k0">
                         <node concept="37vLTw" id="3t4TFam4$FQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="3t4TFam4$FR" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7516,7 +7513,7 @@
                     <node concept="2OqwBi" id="7_1ViNhJVjm" role="3clFbG">
                       <node concept="2OqwBi" id="7_1ViNhJVjn" role="2Oq$k0">
                         <node concept="37vLTw" id="7_1ViNhJVjo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="7_1ViNhJVjp" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7541,7 +7538,7 @@
                     <node concept="2OqwBi" id="5PZNJkfFRDj" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfFQeX" role="2Oq$k0">
                         <node concept="37vLTw" id="5PZNJkfFQ3o" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="5PZNJkfFQV9" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7566,7 +7563,7 @@
                     <node concept="2OqwBi" id="5PZNJkfG6sW" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfG6sX" role="2Oq$k0">
                         <node concept="37vLTw" id="5PZNJkfG6sY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="5PZNJkfG6sZ" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7591,7 +7588,7 @@
                     <node concept="2OqwBi" id="5PZNJkfFYP7" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfFYP8" role="2Oq$k0">
                         <node concept="37vLTw" id="5PZNJkfFYP9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="5PZNJkfFYPa" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7616,7 +7613,7 @@
                     <node concept="2OqwBi" id="3LB9aGk6VUI" role="3clFbG">
                       <node concept="2OqwBi" id="3LB9aGk6VUJ" role="2Oq$k0">
                         <node concept="37vLTw" id="3LB9aGk6VUK" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="3LB9aGk6VUL" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7641,7 +7638,7 @@
                     <node concept="2OqwBi" id="5PZNJkfG8CO" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfG8CP" role="2Oq$k0">
                         <node concept="37vLTw" id="5PZNJkfG8CQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="5PZNJkfG8CR" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7666,7 +7663,7 @@
                     <node concept="2OqwBi" id="5PZNJkfG4o9" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfG4oa" role="2Oq$k0">
                         <node concept="37vLTw" id="5PZNJkfG4ob" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="5PZNJkfG4oc" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7691,7 +7688,7 @@
                     <node concept="2OqwBi" id="7OvELZFRJlT" role="3clFbG">
                       <node concept="2OqwBi" id="7OvELZFRJlU" role="2Oq$k0">
                         <node concept="37vLTw" id="7OvELZFRJlV" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Tg" resolve="binary" />
                         </node>
                         <node concept="3Tsc0h" id="7OvELZFRJlW" role="2OqNvi">
                           <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -7713,9 +7710,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1qmB$fdA_3c" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Tg" role="1bW2Oz">
                   <property role="TrG5h" value="binary" />
-                  <node concept="2jxLKc" id="1qmB$fdA_3d" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Th" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10706,7 +10703,7 @@
                           <node concept="2OqwBi" id="7guffqM0D1p" role="3clFbG">
                             <node concept="2OqwBi" id="7guffqM0D1q" role="2Oq$k0">
                               <node concept="37vLTw" id="7guffqM0D1r" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7guffqM0D1v" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ti" resolve="it" />
                               </node>
                               <node concept="Vyspw" id="7guffqM0D1s" role="2OqNvi">
                                 <node concept="10Nm6u" id="7guffqM0D1t" role="Vysub" />
@@ -10718,9 +10715,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7guffqM0D1v" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ti" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7guffqM0D1w" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Tj" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11635,14 +11632,14 @@
                               <ref role="1Pybhc" to="rmg4:64pi6e6bb0y" resolve="ExecutableHelper" />
                               <ref role="37wK5l" to="rmg4:64pi6e6boTp" resolve="isTest" />
                               <node concept="37vLTw" id="4JZ_DSwhEYb" role="37wK5m">
-                                <ref role="3cqZAo" node="4JZ_DSwhEYc" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Tk" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4JZ_DSwhEYc" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1Tk" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4JZ_DSwhEYd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1Tl" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -11962,14 +11959,14 @@
                                 <ref role="1Pybhc" to="rmg4:64pi6e6bb0y" resolve="ExecutableHelper" />
                                 <ref role="37wK5l" to="rmg4:64pi6e6boTp" resolve="isTest" />
                                 <node concept="37vLTw" id="4JZ_DSwhtzO" role="37wK5m">
-                                  <ref role="3cqZAo" node="4JZ_DSwhtzP" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Tm" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4JZ_DSwhtzP" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Tm" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4JZ_DSwhtzQ" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Tn" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -12049,14 +12046,14 @@
                         <ref role="1Pybhc" to="rmg4:64pi6e6bb0y" resolve="ExecutableHelper" />
                         <ref role="37wK5l" to="rmg4:64pi6e6boTp" resolve="isTest" />
                         <node concept="37vLTw" id="3MG7Fm2voi2" role="37wK5m">
-                          <ref role="3cqZAo" node="3MG7Fm2voi3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1To" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3MG7Fm2voi3" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1To" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3MG7Fm2voi4" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Tp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12097,7 +12094,7 @@
                         </node>
                         <node concept="2OqwBi" id="3MG7Fm2wisI" role="3uHU7B">
                           <node concept="37vLTw" id="3MG7Fm2we$P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3MG7Fm2wdRH" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Tq" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3MG7Fm2wj3S" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -12106,9 +12103,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3MG7Fm2wdRH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Tq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3MG7Fm2wdRI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Tr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12159,14 +12156,14 @@
                         <ref role="1Pybhc" to="rmg4:64pi6e6bb0y" resolve="ExecutableHelper" />
                         <ref role="37wK5l" to="rmg4:64pi6e6boTp" resolve="isTest" />
                         <node concept="37vLTw" id="64pi6e6DWn1" role="37wK5m">
-                          <ref role="3cqZAo" node="64pi6e6DWn2" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Ts" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="64pi6e6DWn2" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Ts" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="64pi6e6DWn3" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Tt" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/runtime.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/runtime.mps
index cee7f31ffbb..c7ac7d391d3 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/runtime.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/runtime.mps
@@ -47,7 +47,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -214,10 +214,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -225,7 +225,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -258,7 +258,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -297,7 +297,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/behavior.mps
index 26ac057ba12..042492bb199 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/behavior.mps
@@ -129,7 +129,7 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -140,13 +140,14 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
         <child id="1200830928149" name="expression" index="2n6tg2" />
       </concept>
@@ -246,7 +247,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -279,7 +280,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1479,7 +1479,7 @@
                       <node concept="3clFbF" id="5gwPKZy6d_v" role="3cqZAp">
                         <node concept="2OqwBi" id="5gwPKZy6dOf" role="3clFbG">
                           <node concept="37vLTw" id="5gwPKZy6d_u" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5gwPKZy6drq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1RY" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="5gwPKZy6ebA" role="2OqNvi">
                             <ref role="37wK5l" node="dkANm6s0zG" resolve="referencedTest" />
@@ -1487,9 +1487,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5gwPKZy6drq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1RY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5gwPKZy6drr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1RZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1500,7 +1500,7 @@
                     <node concept="3clFbF" id="5gwPKZy6f58" role="3cqZAp">
                       <node concept="2OqwBi" id="5gwPKZy6fk8" role="3clFbG">
                         <node concept="37vLTw" id="5gwPKZy6f57" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5gwPKZy6f50" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1S0" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5gwPKZy6fO7" role="2OqNvi">
                           <ref role="37wK5l" node="2SFcQFX9Nhz" resolve="getAssertionCount" />
@@ -1508,9 +1508,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5gwPKZy6f50" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1S0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5gwPKZy6f51" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1S1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1521,7 +1521,7 @@
                   <node concept="3clFbF" id="5gwPKZy6i5Y" role="3cqZAp">
                     <node concept="3cpWs3" id="5gwPKZy6iPt" role="3clFbG">
                       <node concept="37vLTw" id="5gwPKZy6iP$" role="3uHU7w">
-                        <ref role="3cqZAo" node="5gwPKZy6gY5" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1S2" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="5gwPKZy6i5X" role="3uHU7B">
                         <ref role="3cqZAo" node="5gwPKZy6gY3" resolve="s" />
@@ -1533,9 +1533,9 @@
                   <property role="TrG5h" value="s" />
                   <node concept="10Oyi0" id="5gwPKZy6hKb" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="5gwPKZy6gY5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1S2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5gwPKZy6gY6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1S3" role="1tU5fm" />
                 </node>
               </node>
               <node concept="3cmrfG" id="5gwPKZy6hi5" role="1MDeny">
@@ -2265,7 +2265,7 @@
                 <node concept="2OqwBi" id="64pi6e6Cmha" role="3clFbG">
                   <node concept="2OqwBi" id="64pi6e6Cmhb" role="2Oq$k0">
                     <node concept="37vLTw" id="64pi6e6Cmhc" role="2Oq$k0">
-                      <ref role="3cqZAo" node="64pi6e6Cmhg" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN1S4" resolve="it" />
                     </node>
                     <node concept="Vyspw" id="64pi6e6Cmhd" role="2OqNvi">
                       <node concept="10Nm6u" id="64pi6e6Cmhe" role="Vysub" />
@@ -2277,9 +2277,9 @@
                 </node>
               </node>
             </node>
-            <node concept="Rh6nW" id="64pi6e6Cmhg" role="1bW2Oz">
+            <node concept="gl6BB" id="2SR9xrsN1S4" role="1bW2Oz">
               <property role="TrG5h" value="it" />
-              <node concept="2jxLKc" id="64pi6e6Cmhh" role="1tU5fm" />
+              <node concept="2jxLKc" id="2SR9xrsN1S5" role="1tU5fm" />
             </node>
           </node>
         </node>
@@ -2306,7 +2306,7 @@
                     <node concept="3clFbF" id="64pi6e6BUNV" role="3cqZAp">
                       <node concept="2OqwBi" id="64pi6e6BVgv" role="3clFbG">
                         <node concept="37vLTw" id="64pi6e6BUNU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="64pi6e6BUFd" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1S6" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="64pi6e6BY7u" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2314,9 +2314,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="64pi6e6BUFd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1S6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="64pi6e6BUFe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1S7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/com.mbeddr.core.unittest.enumMigration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/com.mbeddr.core.unittest.enumMigration.mps
index be45883616a..3cdfda394f0 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/com.mbeddr.core.unittest.enumMigration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/com.mbeddr.core.unittest.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/constraints.mps
index 9a4abab9af8..4d354e07a61 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/constraints.mps
@@ -35,7 +35,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/editor.mps
index 92a5efcc14e..9a92a31a0bb 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/editor.mps
@@ -26,7 +26,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -85,10 +85,10 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -111,7 +111,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3308396621974588243" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_Contribution" flags="ng" index="3p309x">
@@ -145,7 +145,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -207,7 +207,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -258,7 +258,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/intentions.mps
index 3719a001871..675d3b85370 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/intentions.mps
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,6 +116,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -219,7 +220,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -242,7 +243,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -588,7 +588,7 @@
                     <node concept="3clFbF" id="6GXPbpLjwhF" role="3cqZAp">
                       <node concept="1PxgMI" id="6GXPbpLjwhG" role="3clFbG">
                         <node concept="37vLTw" id="6GXPbpLjwhH" role="1m5AlR">
-                          <ref role="3cqZAo" node="6GXPbpLjwhI" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1S8" resolve="it" />
                         </node>
                         <node concept="chp4Y" id="79i$vAY60dh" role="3oSUPX">
                           <ref role="cht4Q" to="yz9a:6189YbXx_nM" resolve="ITestContext" />
@@ -596,9 +596,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6GXPbpLjwhI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1S8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6GXPbpLjwhJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1S9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -672,7 +672,7 @@
                             </node>
                             <node concept="2OqwBi" id="6GXPbpLjwja" role="3uHU7B">
                               <node concept="37vLTw" id="6GXPbpLjwiP" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6GXPbpLjwiM" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Sa" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="dkANm6sj5s" role="2OqNvi">
                                 <ref role="37wK5l" to="rmg4:dkANm6s0zG" resolve="referencedTest" />
@@ -681,9 +681,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6GXPbpLjwiM" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Sa" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6GXPbpLjwiN" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Sb" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/migration.mps
index 541c4c53c7e..ed92a8c08f1 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
@@ -113,7 +113,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -132,7 +132,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -150,6 +150,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -271,7 +272,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -310,7 +311,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -422,7 +422,7 @@
                               <node concept="2OqwBi" id="6wdRSO4aazm" role="3uHU7B">
                                 <node concept="2OqwBi" id="6wdRSO4aazn" role="2Oq$k0">
                                   <node concept="37vLTw" id="6wdRSO4aazo" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6wdRSO4aazw" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Sg" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="6wdRSO4aazp" role="2OqNvi">
                                     <node concept="1xMEDy" id="6wdRSO4aazq" role="1xVPHs">
@@ -437,7 +437,7 @@
                             </node>
                             <node concept="2OqwBi" id="6wdRSO4aazt" role="3uHU7B">
                               <node concept="37vLTw" id="6wdRSO4aazu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6wdRSO4aazw" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Sg" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="6wdRSO4aazv" role="2OqNvi">
                                 <ref role="37wK5l" to="qd6m:2MbfxrZIa1M" resolve="actsAsMainFunction" />
@@ -446,9 +446,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6wdRSO4aazw" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Sg" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6wdRSO4aazx" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Sh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -490,7 +490,7 @@
                                 <node concept="2OqwBi" id="6wdRSO4anGO" role="3clFbG">
                                   <node concept="2OqwBi" id="6wdRSO4anGP" role="2Oq$k0">
                                     <node concept="37vLTw" id="6wdRSO4anGQ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6wdRSO4anH1" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Sk" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="6wdRSO4anGR" role="2OqNvi">
                                       <ref role="3TtcxE" to="yz9a:4VEDcE28GYo" resolve="tests" />
@@ -502,24 +502,24 @@
                                         <node concept="3clFbF" id="6wdRSO4anGV" role="3cqZAp">
                                           <node concept="2OqwBi" id="6wdRSO4anGW" role="3clFbG">
                                             <node concept="37vLTw" id="6wdRSO4anGX" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6wdRSO4anGZ" resolve="that" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1Si" resolve="that" />
                                             </node>
                                             <node concept="1$rogu" id="6wdRSO4anGY" role="2OqNvi" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="6wdRSO4anGZ" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1Si" role="1bW2Oz">
                                         <property role="TrG5h" value="that" />
-                                        <node concept="2jxLKc" id="6wdRSO4anH0" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1Sj" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6wdRSO4anH1" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Sk" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6wdRSO4anH2" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Sl" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -668,7 +668,7 @@
                                   <node concept="2OqwBi" id="ILZbnBScfq" role="3clFbG">
                                     <node concept="2OqwBi" id="ILZbnBScfr" role="2Oq$k0">
                                       <node concept="37vLTw" id="ILZbnBScfs" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="ILZbnBScg7" resolve="binary" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1Ss" resolve="binary" />
                                       </node>
                                       <node concept="2qgKlT" id="ILZbnBScft" role="2OqNvi">
                                         <ref role="37wK5l" to="ahli:3BbcpZJ16uV" resolve="allReferencedModules" />
@@ -682,7 +682,7 @@
                                             <node concept="2OqwBi" id="ILZbnBScfz" role="3clFbG">
                                               <node concept="2OqwBi" id="ILZbnBScf$" role="2Oq$k0">
                                                 <node concept="37vLTw" id="ILZbnBScf_" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="ILZbnBScg5" resolve="module" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Sq" resolve="module" />
                                                 </node>
                                                 <node concept="2Rf3mk" id="ILZbnBScfA" role="2OqNvi">
                                                   <node concept="1xMEDy" id="ILZbnBScfB" role="1xVPHs">
@@ -700,7 +700,7 @@
                                                         <node concept="2OqwBi" id="7l4X52HelHD" role="2Oq$k0">
                                                           <node concept="2OqwBi" id="7l4X52Helae" role="2Oq$k0">
                                                             <node concept="37vLTw" id="7l4X52HekRu" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="ILZbnBScg3" resolve="reqConfigItem" />
+                                                              <ref role="3cqZAo" node="2SR9xrsN1So" resolve="reqConfigItem" />
                                                             </node>
                                                             <node concept="2yIwOk" id="7l4X52HelwA" role="2OqNvi" />
                                                           </node>
@@ -714,7 +714,7 @@
                                                               <node concept="3clFbF" id="7l4X52HepPC" role="3cqZAp">
                                                                 <node concept="3clFbC" id="7l4X52HepPD" role="3clFbG">
                                                                   <node concept="37vLTw" id="7l4X52HepPG" role="3uHU7B">
-                                                                    <ref role="3cqZAo" node="7l4X52HeoX5" resolve="configItem" />
+                                                                    <ref role="3cqZAo" node="2SR9xrsN1Sm" resolve="configItem" />
                                                                   </node>
                                                                   <node concept="3B5_sB" id="115mCuKV7Gn" role="3uHU7w">
                                                                     <ref role="3B5MYn" to="yz9a:7tWSY$P9Odb" resolve="UnitTestConfigItem" />
@@ -722,9 +722,9 @@
                                                                 </node>
                                                               </node>
                                                             </node>
-                                                            <node concept="Rh6nW" id="7l4X52HeoX5" role="1bW2Oz">
+                                                            <node concept="gl6BB" id="2SR9xrsN1Sm" role="1bW2Oz">
                                                               <property role="TrG5h" value="configItem" />
-                                                              <node concept="2jxLKc" id="7l4X52HeoX6" role="1tU5fm" />
+                                                              <node concept="2jxLKc" id="2SR9xrsN1Sn" role="1tU5fm" />
                                                             </node>
                                                           </node>
                                                         </node>
@@ -732,27 +732,27 @@
                                                     </node>
                                                     <node concept="3clFbH" id="7l4X52Heqbe" role="3cqZAp" />
                                                   </node>
-                                                  <node concept="Rh6nW" id="ILZbnBScg3" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="2SR9xrsN1So" role="1bW2Oz">
                                                     <property role="TrG5h" value="reqConfigItem" />
-                                                    <node concept="2jxLKc" id="ILZbnBScg4" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="2SR9xrsN1Sp" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="ILZbnBScg5" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN1Sq" role="1bW2Oz">
                                           <property role="TrG5h" value="module" />
-                                          <node concept="2jxLKc" id="ILZbnBScg6" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN1Sr" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="ILZbnBScg7" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Ss" role="1bW2Oz">
                                 <property role="TrG5h" value="binary" />
-                                <node concept="2jxLKc" id="ILZbnBScg8" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1St" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -935,7 +935,7 @@
                           </node>
                           <node concept="2OqwBi" id="cq0bwnQeJ$" role="37vLTJ">
                             <node concept="37vLTw" id="cq0bwnQeAL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="cq0bwnQey9" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Su" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="cq0bwogHR8" role="2OqNvi">
                               <ref role="3TsBF5" to="yz9a:7nMAuIoJbju" resolve="entrypoint" />
@@ -944,9 +944,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="cq0bwnQey9" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Su" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="cq0bwnQeya" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Sv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -978,7 +978,7 @@
                           <node concept="2OqwBi" id="cq0bwnQANu" role="3clFbG">
                             <node concept="2OqwBi" id="cq0bwnQANv" role="2Oq$k0">
                               <node concept="37vLTw" id="cq0bwnQANw" role="2Oq$k0">
-                                <ref role="3cqZAo" node="cq0bwnQAN_" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Sw" resolve="it" />
                               </node>
                               <node concept="2Rf3mk" id="cq0bwnQANx" role="2OqNvi">
                                 <node concept="1xMEDy" id="cq0bwnQANy" role="1xVPHs">
@@ -992,9 +992,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="cq0bwnQAN_" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Sw" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="cq0bwnQANA" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Sx" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1029,7 +1029,7 @@
                                 <node concept="3clFbF" id="cq0bwnR9n4" role="3cqZAp">
                                   <node concept="2OqwBi" id="cq0bwnR9tb" role="3clFbG">
                                     <node concept="37vLTw" id="cq0bwnR9n3" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="cq0bwnR9i7" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Sy" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="cq0bwnR9ZB" role="2OqNvi">
                                       <ref role="3Tt5mk" to="yz9a:4VEDcE28GXU" resolve="testcase" />
@@ -1037,9 +1037,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="cq0bwnR9i7" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1Sy" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="cq0bwnR9i8" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1Sz" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1056,7 +1056,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="cq0bwnRbBv" role="3uHU7B">
                                   <node concept="37vLTw" id="cq0bwnRb2e" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="cq0bwnRaXj" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1S$" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="cq0bwnRcn8" role="2OqNvi">
                                     <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -1065,9 +1065,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="cq0bwnRaXj" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1S$" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="cq0bwnRaXk" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1S_" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1082,7 +1082,7 @@
                               </node>
                               <node concept="2OqwBi" id="cq0bwnRfM2" role="37vLTJ">
                                 <node concept="37vLTw" id="cq0bwnRfkk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="cq0bwnRffC" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1SA" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="cq0bwnRhrF" role="2OqNvi">
                                   <ref role="3TsBF5" to="x27k:19a6$uAA0vK" resolve="exported" />
@@ -1091,9 +1091,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="cq0bwnRffC" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1SA" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="cq0bwnRffD" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1SB" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1126,7 +1126,7 @@
                                 <node concept="3clFbF" id="cq0bwnQK7J" role="3cqZAp">
                                   <node concept="2OqwBi" id="cq0bwnQK7K" role="3clFbG">
                                     <node concept="37vLTw" id="cq0bwnQK7L" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="cq0bwnQK7P" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1SC" resolve="it" />
                                     </node>
                                     <node concept="2Xjw5R" id="cq0bwnQK7M" role="2OqNvi">
                                       <node concept="1xMEDy" id="cq0bwnQK7N" role="1xVPHs">
@@ -1138,9 +1138,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="cq0bwnQK7P" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1SC" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="cq0bwnQK7Q" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1SD" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1211,15 +1211,15 @@
                                     <node concept="3clFbF" id="cq0bwnVn2F" role="3cqZAp">
                                       <node concept="2OqwBi" id="cq0bwnVnpY" role="3clFbG">
                                         <node concept="37vLTw" id="cq0bwnVn2E" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="cq0bwnVmxu" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1SE" resolve="it" />
                                         </node>
                                         <node concept="3YRAZt" id="cq0bwnVoCz" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="cq0bwnVmxu" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1SE" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="cq0bwnVmxv" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1SF" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1255,7 +1255,7 @@
                                             <node concept="2OqwBi" id="cq0bwnQV3H" role="3clFbG">
                                               <node concept="2OqwBi" id="cq0bwnQV3I" role="2Oq$k0">
                                                 <node concept="37vLTw" id="cq0bwnQV3J" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="cq0bwnQV3O" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1SG" resolve="it" />
                                                 </node>
                                                 <node concept="2Rf3mk" id="cq0bwnQV3K" role="2OqNvi">
                                                   <node concept="1xMEDy" id="cq0bwnQV3L" role="1xVPHs">
@@ -1269,9 +1269,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="cq0bwnQV3O" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN1SG" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="cq0bwnQV3P" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN1SH" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -1282,15 +1282,15 @@
                                         <node concept="3clFbF" id="cq0bwnVpOU" role="3cqZAp">
                                           <node concept="2OqwBi" id="cq0bwnVpX6" role="3clFbG">
                                             <node concept="37vLTw" id="cq0bwnVpOT" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="cq0bwnVpH3" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1SI" resolve="it" />
                                             </node>
                                             <node concept="3YRAZt" id="cq0bwnVqoH" role="2OqNvi" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="cq0bwnVpH3" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1SI" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="cq0bwnVpH4" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1SJ" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1377,7 +1377,7 @@
                           <node concept="2OqwBi" id="cq0bwnSRk6" role="3clFbG">
                             <node concept="2OqwBi" id="cq0bwnSRk7" role="2Oq$k0">
                               <node concept="37vLTw" id="cq0bwnSRk8" role="2Oq$k0">
-                                <ref role="3cqZAo" node="cq0bwnSRko" resolve="func" />
+                                <ref role="3cqZAo" node="2SR9xrsN1SM" resolve="func" />
                               </node>
                               <node concept="2Rf3mk" id="cq0bwnSRk9" role="2OqNvi">
                                 <node concept="1xMEDy" id="cq0bwnSRka" role="1xVPHs">
@@ -1398,7 +1398,7 @@
                                       <node concept="2Nt0df" id="cq0bwnSRki" role="2OqNvi">
                                         <node concept="2OqwBi" id="cq0bwnSRkj" role="38cxEo">
                                           <node concept="37vLTw" id="cq0bwnSRkk" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="cq0bwnSRkm" resolve="funcCall" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1SK" resolve="funcCall" />
                                           </node>
                                           <node concept="3TrEf2" id="cq0bwnSRkl" role="2OqNvi">
                                             <ref role="3Tt5mk" to="x27k:5ak6HMA0red" resolve="function" />
@@ -1408,18 +1408,18 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="cq0bwnSRkm" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1SK" role="1bW2Oz">
                                   <property role="TrG5h" value="funcCall" />
-                                  <node concept="2jxLKc" id="cq0bwnSRkn" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1SL" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="cq0bwnSRko" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1SM" role="1bW2Oz">
                         <property role="TrG5h" value="func" />
-                        <node concept="2jxLKc" id="cq0bwnSRkp" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1SN" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1509,15 +1509,15 @@
                   <node concept="3clFbF" id="cq0bwnY0VL" role="3cqZAp">
                     <node concept="2OqwBi" id="cq0bwnY18C" role="3clFbG">
                       <node concept="37vLTw" id="cq0bwnY0VJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="cq0bwnY0Lw" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1SO" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="cq0bwnY24a" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="cq0bwnY0Lw" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1SO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="cq0bwnY0Lx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1SP" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1712,7 +1712,7 @@
                         <node concept="2OqwBi" id="7BqFpRybMXh" role="3clFbG">
                           <node concept="2OqwBi" id="7BqFpRybLXa" role="2Oq$k0">
                             <node concept="37vLTw" id="7BqFpRybLLh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7BqFpRybLF2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1SQ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7BqFpRybMwz" role="2OqNvi">
                               <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" resolve="testStrategy" />
@@ -1722,9 +1722,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7BqFpRybLF2" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1SQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7BqFpRybLF3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1SR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/scripts.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/scripts.mps
index 71796df7db3..9538d47fc03 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/scripts.mps
@@ -47,7 +47,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps
index 00098c4973f..e82747d44a3 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps
@@ -101,6 +101,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -270,7 +271,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -1456,7 +1456,7 @@
                             <node concept="2OqwBi" id="76Xv5Ts1qqc" role="3fr31v">
                               <node concept="2OqwBi" id="76Xv5Ts1qqd" role="2Oq$k0">
                                 <node concept="37vLTw" id="76Xv5Ts1qqe" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="76Xv5Ts1qqh" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Sc" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="76Xv5Ts1qqf" role="2OqNvi">
                                   <ref role="3Tt5mk" to="yz9a:4VEDcE28GXU" resolve="testcase" />
@@ -1469,9 +1469,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="76Xv5Ts1qqh" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Sc" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="76Xv5Ts1qqi" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Sd" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1482,7 +1482,7 @@
                       <node concept="3clFbF" id="76Xv5Ts1r_P" role="3cqZAp">
                         <node concept="2OqwBi" id="76Xv5Ts1rJk" role="3clFbG">
                           <node concept="37vLTw" id="76Xv5Ts1r_O" role="2Oq$k0">
-                            <ref role="3cqZAo" node="76Xv5Ts1rza" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Se" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="76Xv5Ts1shU" role="2OqNvi">
                             <ref role="3Tt5mk" to="yz9a:4VEDcE28GXU" resolve="testcase" />
@@ -1490,9 +1490,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="76Xv5Ts1rza" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Se" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="76Xv5Ts1rzb" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Sf" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps
index 171af6b503d..f35f35c4d17 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -30,6 +30,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -50,7 +51,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -103,7 +104,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -117,7 +118,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -162,7 +163,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -178,6 +179,7 @@
   <node concept="sE7Ow" id="78Ts1skpdx2">
     <property role="TrG5h" value="makeMinimalTest" />
     <property role="2uzpH1" value="Create Minimal Test" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="78Ts1skpdx3" role="tncku">
       <node concept="3clFbS" id="78Ts1skpdx4" role="2VODD2">
         <node concept="3clFbH" id="78Ts1skpiUv" role="3cqZAp" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd
index ec5a8b5e54b..7df29e2e673 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.unittest.pluginSolution" uuid="2065036e-0268-4117-bba0-01b441b12c1c" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.unittest.pluginSolution" uuid="2065036e-0268-4117-bba0-01b441b12c1c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -28,13 +27,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
@@ -92,7 +91,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl
index eceb5dec770..fdbb9ea6597 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl
@@ -62,7 +62,7 @@
         <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -211,7 +211,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -247,7 +246,7 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -270,7 +269,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/com/mbeddr/core/util/generator/com/mbeddr/core/util/rt.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/com/mbeddr/core/util/generator/com/mbeddr/core/util/rt.mps
index b38e8ff5d84..fa31b373d8a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/com/mbeddr/core/util/generator/com/mbeddr/core/util/rt.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/com/mbeddr/core/util/generator/com/mbeddr/core/util/rt.mps
@@ -73,7 +73,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -84,7 +84,7 @@
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -137,7 +137,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps
index 1bda2f799fe..c715e8521d9 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps
@@ -148,7 +148,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -193,7 +193,7 @@
       <concept id="745648737914844472" name="com.mbeddr.core.statements.structure.AnyNodeItem" flags="ng" index="2sYeqF">
         <child id="745648737914844473" name="theNode" index="2sYeqE" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -307,7 +307,7 @@
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
@@ -364,7 +364,7 @@
       <concept id="1195502151594" name="jetbrains.mps.lang.generator.structure.MappingScriptReference" flags="lg" index="1puMqW">
         <reference id="1195502167610" name="mappingScript" index="1puQsG" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ngI" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
       <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX">
@@ -400,6 +400,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -566,7 +567,7 @@
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -574,7 +575,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -726,7 +727,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -759,7 +760,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
@@ -826,7 +827,6 @@
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -2241,7 +2241,7 @@
                                             <ref role="3cqZAo" node="Kk0nz9Abhc" resolve="n" />
                                           </node>
                                           <node concept="37vLTw" id="Kk0nz9Abhu" role="3GDnbk">
-                                            <ref role="3cqZAo" node="Kk0nz9Abh8" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1Ux" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="3GDn8_" id="Kk0nz9Abhy" role="3cqZAp">
@@ -2257,9 +2257,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="Kk0nz9Abh8" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1Ux" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="Kk0nz9Abh9" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1Uy" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -6264,7 +6264,7 @@
                                             <node concept="2OqwBi" id="5qJgyBhEtGB" role="2Oq$k0">
                                               <node concept="1PxgMI" id="5qJgyBhEtfT" role="2Oq$k0">
                                                 <node concept="37vLTw" id="5qJgyBhEsoN" role="1m5AlR">
-                                                  <ref role="3cqZAo" node="3_EX3Wi7VtC" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Uz" resolve="it" />
                                                 </node>
                                                 <node concept="chp4Y" id="1SbcsM$FvTP" role="3oSUPX">
                                                   <ref role="cht4Q" to="clbe:3DiW6qrFL9V" resolve="MemberInitExpression" />
@@ -6278,9 +6278,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="3_EX3Wi7VtC" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1Uz" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="3_EX3Wi7VtD" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1U$" role="1tU5fm" />
                                       </node>
                                     </node>
                                     <node concept="1nlBCl" id="3_EX3Wi7VtE" role="2S7zOq">
@@ -6315,14 +6315,14 @@
                                           <ref role="3Tt5mk" to="clbe:3DiW6qrFQZA" resolve="value" />
                                         </node>
                                         <node concept="37vLTw" id="3_EX3Wi7Vud" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3_EX3Wi7Vua" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1U_" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3_EX3Wi7Vua" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1U_" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3_EX3Wi7Vub" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1UA" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -6405,7 +6405,7 @@
                     <node concept="3clFbF" id="3_EX3Wi7VpO" role="3cqZAp">
                       <node concept="2OqwBi" id="3_EX3Wi7Vqa" role="3clFbG">
                         <node concept="37vLTw" id="3_EX3Wi7VpP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3_EX3Wi7VpM" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1UB" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3_EX3Wi7Vqg" role="2OqNvi">
                           <node concept="chp4Y" id="3_EX3Wi7Vqi" role="cj9EB">
@@ -6415,9 +6415,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3_EX3Wi7VpM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1UB" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3_EX3Wi7VpN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1UC" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10741,7 +10741,7 @@
                       <node concept="3clFbF" id="1M41OHtWToF" role="3cqZAp">
                         <node concept="2OqwBi" id="1M41OHtWToG" role="3clFbG">
                           <node concept="37vLTw" id="1M41OHtWToH" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1M41OHtWToJ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1UD" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1M41OHtWToI" role="2OqNvi">
                             <ref role="3TsBF5" to="k146:1M41OHsVOo9" resolve="active" />
@@ -10749,9 +10749,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1M41OHtWToJ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1UD" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1M41OHtWToK" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1UE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -14125,7 +14125,7 @@
                                   <node concept="3clFbF" id="2qTj7CwNui6" role="3cqZAp">
                                     <node concept="2OqwBi" id="2qTj7CwNui7" role="3clFbG">
                                       <node concept="37vLTw" id="2qTj7CwNui8" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2qTj7CwNuia" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1UF" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="2qTj7CwNui9" role="2OqNvi">
                                         <ref role="3TsBF5" to="k146:1M41OHsVOo9" resolve="active" />
@@ -14133,9 +14133,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2qTj7CwNuia" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1UF" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="2qTj7CwNuib" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1UG" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -14758,7 +14758,7 @@
                                 <node concept="2OqwBi" id="1h0uThimFD3" role="2Oq$k0">
                                   <node concept="2OqwBi" id="1h0uThimFD4" role="2Oq$k0">
                                     <node concept="37vLTw" id="1h0uThimFD5" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1h0uThimFDa" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1UH" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="1h0uThimFD6" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -14774,9 +14774,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1h0uThimFDa" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1UH" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1h0uThimFDb" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1UI" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -15815,7 +15815,7 @@
                     <node concept="3clFbF" id="79_VoWRYuzJ" role="3cqZAp">
                       <node concept="2OqwBi" id="79_VoWRYuzK" role="3clFbG">
                         <node concept="37vLTw" id="79_VoWRYuzL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="79_VoWRYuzO" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1UJ" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="79_VoWRYuzM" role="2OqNvi">
                           <node concept="chp4Y" id="79_VoWRYuzN" role="cj9EB">
@@ -15825,9 +15825,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="79_VoWRYuzO" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1UJ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="79_VoWRYuzP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1UK" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -15861,7 +15861,7 @@
                             <node concept="2OqwBi" id="5qJgyBhBA1Q" role="2Oq$k0">
                               <node concept="2OqwBi" id="5qJgyBhByZV" role="2Oq$k0">
                                 <node concept="37vLTw" id="5qJgyBhByD2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="79_VoWRQ7_A" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1UL" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="5qJgyBhB$eL" role="2OqNvi">
                                   <ref role="3TtcxE" to="c4fa:7FkLcyyQKyy" resolve="elements" />
@@ -15877,9 +15877,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="79_VoWRQ7_A" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1UL" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="79_VoWRQ7_B" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1UM" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -15978,7 +15978,7 @@
                                       <node concept="1PxgMI" id="5qJgyBhC0FJ" role="3clFbG">
                                         <node concept="2OqwBi" id="5qJgyBhBXMl" role="1m5AlR">
                                           <node concept="37vLTw" id="5qJgyBhBXlR" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5qJgyBhBX3A" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1UN" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="5qJgyBhBZCZ" role="2OqNvi">
                                             <ref role="3Tt5mk" to="clbe:3DiW6qrFRdx" resolve="element" />
@@ -15990,9 +15990,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5qJgyBhBX3A" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1UN" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5qJgyBhBX3B" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1UO" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -17680,7 +17680,7 @@
                               <node concept="3clFbF" id="5usoWIJ3jLs" role="3cqZAp">
                                 <node concept="2OqwBi" id="5usoWIJ3jUA" role="3clFbG">
                                   <node concept="37vLTw" id="5usoWIJ3jLr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5usoWIJ3jqN" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1UP" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="5usoWIJ3k_X" role="2OqNvi">
                                     <ref role="3TsBF5" to="k146:2lgwE2U38zk" resolve="active" />
@@ -17688,9 +17688,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5usoWIJ3jqN" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1UP" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5usoWIJ3jqO" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1UQ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -17844,14 +17844,14 @@
                                     <ref role="3TsBF5" to="k146:5oFMniD7jqL" resolve="count" />
                                   </node>
                                   <node concept="37vLTw" id="5usoWIJ2LVE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5usoWIJ2LVF" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1UR" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5usoWIJ2LVF" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1UR" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5usoWIJ2LVG" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1US" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -18358,7 +18358,7 @@
                       </node>
                       <node concept="2OqwBi" id="5tbhN$5V4bB" role="37vLTJ">
                         <node concept="37vLTw" id="5tbhN$5V45Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5tbhN$5V43J" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1UT" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="5tbhN$5V4CW" role="2OqNvi">
                           <node concept="3CFYIy" id="5tbhN$5V5o0" role="3CFYIz">
@@ -18369,9 +18369,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5tbhN$5V43J" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1UT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5tbhN$5V43K" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1UU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -20503,7 +20503,7 @@
                         <node concept="10Nm6u" id="7kmhBx3iPNg" role="3uHU7w" />
                         <node concept="2OqwBi" id="7kmhBx3iPNh" role="3uHU7B">
                           <node concept="37vLTw" id="7kmhBx3iPNi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7kmhBx3iPNl" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1UV" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="7kmhBx3iPNj" role="2OqNvi">
                             <node concept="3CFYIy" id="7kmhBx3iPNk" role="3CFYIz">
@@ -20514,9 +20514,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7kmhBx3iPNl" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1UV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7kmhBx3iPNm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1UW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -20535,7 +20535,7 @@
                     <node concept="2OqwBi" id="7kmhBx3gdpL" role="3clFbG">
                       <node concept="2OqwBi" id="7kmhBx3g9Vc" role="2Oq$k0">
                         <node concept="37vLTw" id="7kmhBx3g9Fy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7kmhBx3g9CM" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1UX" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="7kmhBx3gbaG" role="2OqNvi">
                           <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
@@ -20555,7 +20555,7 @@
                                     <node concept="2OqwBi" id="4jiR73uGvjd" role="36biLW">
                                       <node concept="2OqwBi" id="4jiR73uGqof" role="2Oq$k0">
                                         <node concept="37vLTw" id="4jiR73uGoW7" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7kmhBx3g9CM" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1UX" resolve="it" />
                                         </node>
                                         <node concept="3CFZ6_" id="4jiR73uGsIy" role="2OqNvi">
                                           <node concept="3CFYIy" id="4jiR73uGu1$" role="3CFYIz">
@@ -20585,9 +20585,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7kmhBx3g9CM" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1UX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7kmhBx3g9CN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1UY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -20928,7 +20928,7 @@
                           <node concept="2OqwBi" id="kOmZ6td_u2" role="3clFbG">
                             <node concept="2OqwBi" id="kOmZ6tdzqI" role="2Oq$k0">
                               <node concept="37vLTw" id="kOmZ6tdz6W" role="2Oq$k0">
-                                <ref role="3cqZAo" node="kOmZ6tdz3V" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1UZ" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="kOmZ6td$L4" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -20953,9 +20953,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="kOmZ6tdz3V" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1UZ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="kOmZ6tdz3W" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1V0" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -21036,7 +21036,7 @@
                           <node concept="2OqwBi" id="2CzB6HCQHTt" role="3clFbG">
                             <node concept="2OqwBi" id="2CzB6HCQHTu" role="2Oq$k0">
                               <node concept="37vLTw" id="2CzB6HCQHTv" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CzB6HCQHTC" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1V1" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2CzB6HCQHTw" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -21061,9 +21061,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2CzB6HCQHTC" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1V1" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2CzB6HCQHTD" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1V2" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -23388,7 +23388,7 @@
                       <node concept="1PxgMI" id="kOmZ6tmwkE" role="37wK5m">
                         <node concept="2OqwBi" id="kOmZ6tmw1k" role="1m5AlR">
                           <node concept="37vLTw" id="kOmZ6tmvOl" role="2Oq$k0">
-                            <ref role="3cqZAo" node="kOmZ6tlLIB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1V3" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="kOmZ6tmwdd" role="2OqNvi" />
                         </node>
@@ -23399,9 +23399,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="kOmZ6tlLIB" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1V3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="kOmZ6tlLIC" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1V4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -23432,7 +23432,7 @@
                       <node concept="3clFbF" id="kOmZ6toeA2" role="3cqZAp">
                         <node concept="2OqwBi" id="kOmZ6toeA3" role="3clFbG">
                           <node concept="37vLTw" id="kOmZ6toeA4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="kOmZ6toeA8" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1V5" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="kOmZ6toeA5" role="2OqNvi">
                             <node concept="1xMEDy" id="kOmZ6toeA6" role="1xVPHs">
@@ -23444,9 +23444,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="kOmZ6toeA8" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1V5" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="kOmZ6toeA9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1V6" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -23480,7 +23480,7 @@
                           <node concept="2OqwBi" id="kOmZ6tq7PL" role="3clFbG">
                             <node concept="2OqwBi" id="kOmZ6tq7PM" role="2Oq$k0">
                               <node concept="37vLTw" id="kOmZ6tq7PN" role="2Oq$k0">
-                                <ref role="3cqZAo" node="kOmZ6tq7PR" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1V7" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="kOmZ6tq7PO" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -23495,9 +23495,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="kOmZ6tq7PR" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1V7" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="kOmZ6tq7PS" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1V8" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -23559,7 +23559,7 @@
                           <node concept="2OqwBi" id="kOmZ6tq9cL" role="3clFbG">
                             <node concept="2OqwBi" id="kOmZ6tq9cM" role="2Oq$k0">
                               <node concept="37vLTw" id="kOmZ6tq9cN" role="2Oq$k0">
-                                <ref role="3cqZAo" node="kOmZ6tq9cR" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1V9" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="kOmZ6tq9cO" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -23574,9 +23574,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="kOmZ6tq9cR" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1V9" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="kOmZ6tq9cS" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Va" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -23628,7 +23628,7 @@
                       <node concept="3clFbF" id="kOmZ6togbn" role="3cqZAp">
                         <node concept="2OqwBi" id="kOmZ6togbo" role="3clFbG">
                           <node concept="37vLTw" id="kOmZ6togbp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="kOmZ6toeOV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vb" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="kOmZ6togbq" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -23641,7 +23641,7 @@
                       <node concept="3clFbF" id="kOmZ6toeQp" role="3cqZAp">
                         <node concept="2OqwBi" id="kOmZ6tof1e" role="3clFbG">
                           <node concept="37vLTw" id="kOmZ6toeQo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="kOmZ6toeOV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vb" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="kOmZ6tofRq" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -23652,9 +23652,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="kOmZ6toeOV" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Vb" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="kOmZ6toeOW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Vc" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -23794,7 +23794,7 @@
                                 <node concept="2OqwBi" id="2CzB6HDDHtg" role="3fr31v">
                                   <node concept="2OqwBi" id="2CzB6HDDHth" role="2Oq$k0">
                                     <node concept="37vLTw" id="2CzB6HDDHti" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2CzB6HDDCLc" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Vd" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="2CzB6HDDHtj" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -23809,9 +23809,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2CzB6HDDCLc" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Vd" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2CzB6HDDCLd" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Ve" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -23910,7 +23910,7 @@
                               <node concept="2OqwBi" id="2CzB6HDDMul" role="3clFbG">
                                 <node concept="2OqwBi" id="2CzB6HDDNpB" role="2Oq$k0">
                                   <node concept="37vLTw" id="2CzB6HDDMi_" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2CzB6HDDMaQ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Vf" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2CzB6HDDNMd" role="2OqNvi">
                                     <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -23924,9 +23924,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2CzB6HDDMaQ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1Vf" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2CzB6HDDMaR" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1Vg" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -25824,7 +25824,7 @@
                         <node concept="2OqwBi" id="2CzB6HDdeoP" role="3clFbG">
                           <node concept="2OqwBi" id="2CzB6HDddDC" role="2Oq$k0">
                             <node concept="37vLTw" id="2CzB6HDdd_3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2CzB6HDddtL" resolve="binary" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Vh" resolve="binary" />
                             </node>
                             <node concept="3Tsc0h" id="2CzB6HDddMI" role="2OqNvi">
                               <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -25848,9 +25848,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2CzB6HDddtL" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Vh" role="1bW2Oz">
                       <property role="TrG5h" value="binary" />
-                      <node concept="2jxLKc" id="2CzB6HDddtM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Vi" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -25898,7 +25898,7 @@
                         </node>
                         <node concept="2OqwBi" id="2CzB6HDh3Ep" role="3uHU7B">
                           <node concept="37vLTw" id="2CzB6HDh3tu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CzB6HDh3qI" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vj" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2CzB6HDh47h" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -25907,9 +25907,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2CzB6HDh3qI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Vj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2CzB6HDh3qJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Vk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -25936,7 +25936,7 @@
                       <node concept="2OqwBi" id="2CzB6HDgMfG" role="3clFbG">
                         <node concept="2OqwBi" id="2CzB6HDgKRq" role="2Oq$k0">
                           <node concept="37vLTw" id="2CzB6HDgKI1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CzB6HDgKFt" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vl" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="2CzB6HDgLtk" role="2OqNvi">
                             <node concept="1xMEDy" id="2CzB6HDgLtm" role="1xVPHs">
@@ -25950,9 +25950,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2CzB6HDgKFt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Vl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2CzB6HDgKFu" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Vm" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -25963,7 +25963,7 @@
                   <node concept="3clFbF" id="2CzB6HDgNWR" role="3cqZAp">
                     <node concept="2OqwBi" id="2CzB6HDgO6j" role="3clFbG">
                       <node concept="37vLTw" id="2CzB6HDgNWP" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2CzB6HDgNNf" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Vn" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="2CzB6HDgP0K" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -25975,9 +25975,9 @@
                   </node>
                   <node concept="3clFbH" id="2CzB6HDgNRH" role="3cqZAp" />
                 </node>
-                <node concept="Rh6nW" id="2CzB6HDgNNf" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Vn" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2CzB6HDgNNg" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Vo" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -26013,7 +26013,7 @@
                       <node concept="1PxgMI" id="2CzB6HD_lka" role="37wK5m">
                         <node concept="2OqwBi" id="2CzB6HD_lkb" role="1m5AlR">
                           <node concept="37vLTw" id="2CzB6HD_lkc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CzB6HDr0WK" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vp" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="2CzB6HD_lkd" role="2OqNvi" />
                         </node>
@@ -26024,9 +26024,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2CzB6HDr0WK" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Vp" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2CzB6HDr0WL" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Vq" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -26057,7 +26057,7 @@
                       <node concept="3clFbF" id="2CzB6HDr0X0" role="3cqZAp">
                         <node concept="2OqwBi" id="2CzB6HDr0X1" role="3clFbG">
                           <node concept="37vLTw" id="2CzB6HDr0X2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CzB6HDr0X6" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vr" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="2CzB6HDr0X3" role="2OqNvi">
                             <node concept="1xMEDy" id="2CzB6HDr0X4" role="1xVPHs">
@@ -26069,9 +26069,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2CzB6HDr0X6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Vr" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2CzB6HDr0X7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Vs" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -26105,7 +26105,7 @@
                           <node concept="2OqwBi" id="2CzB6HDr0Xn" role="3clFbG">
                             <node concept="2OqwBi" id="2CzB6HDr0Xo" role="2Oq$k0">
                               <node concept="37vLTw" id="2CzB6HDr0Xp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CzB6HDr0Xt" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Vt" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2CzB6HDr0Xq" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -26120,9 +26120,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2CzB6HDr0Xt" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Vt" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2CzB6HDr0Xu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Vu" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -26184,7 +26184,7 @@
                           <node concept="2OqwBi" id="2CzB6HDr0XU" role="3clFbG">
                             <node concept="2OqwBi" id="2CzB6HDr0XV" role="2Oq$k0">
                               <node concept="37vLTw" id="2CzB6HDr0XW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CzB6HDr0Y0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Vv" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2CzB6HDr0XX" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -26199,9 +26199,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2CzB6HDr0Y0" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Vv" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2CzB6HDr0Y1" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Vw" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -26253,7 +26253,7 @@
                       <node concept="3clFbF" id="2CzB6HDr0Yp" role="3cqZAp">
                         <node concept="2OqwBi" id="2CzB6HDr0Yq" role="3clFbG">
                           <node concept="37vLTw" id="2CzB6HDr0Yr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CzB6HDr0Yz" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vx" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2CzB6HDr0Ys" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -26266,7 +26266,7 @@
                       <node concept="3clFbF" id="2CzB6HDr0Yu" role="3cqZAp">
                         <node concept="2OqwBi" id="2CzB6HDr0Yv" role="3clFbG">
                           <node concept="37vLTw" id="2CzB6HDr0Yw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CzB6HDr0Yz" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Vx" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2CzB6HDr0Yx" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -26277,9 +26277,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2CzB6HDr0Yz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Vx" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2CzB6HDr0Y$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Vy" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -26442,7 +26442,7 @@
                     <node concept="37vLTI" id="1lYd87JD5aB" role="3clFbG">
                       <node concept="2OqwBi" id="1lYd87JBVbD" role="37vLTJ">
                         <node concept="37vLTw" id="1lYd87JBV4B" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1lYd87JBUiT" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Vz" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="1lYd87JD513" role="2OqNvi">
                           <node concept="3CFYIy" id="1lYd87JD54V" role="3CFYIz">
@@ -26474,9 +26474,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1lYd87JBUiT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Vz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1lYd87JBUiU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1V$" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -27053,7 +27053,7 @@
                             <node concept="1Wc70l" id="4pp8_8SxgAa" role="3clFbG">
                               <node concept="2OqwBi" id="4pp8_8SxdcH" role="3uHU7B">
                                 <node concept="37vLTw" id="4pp8_8SwQRs" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4pp8_8SwQ0e" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1V_" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="4pp8_8Sxezp" role="2OqNvi">
                                   <node concept="chp4Y" id="4pp8_8Sxfp_" role="cj9EB">
@@ -27070,7 +27070,7 @@
                                           <ref role="cht4Q" to="c4fa:2I09F8VKHC0" resolve="SwitchCase" />
                                         </node>
                                         <node concept="37vLTw" id="4pp8_8Sxhxz" role="1m5AlR">
-                                          <ref role="3cqZAo" node="4pp8_8SwQ0e" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN1V_" resolve="it" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="4pp8_8SxmRO" role="2OqNvi">
@@ -27087,7 +27087,7 @@
                                             <ref role="cht4Q" to="c4fa:2I09F8VKHC0" resolve="SwitchCase" />
                                           </node>
                                           <node concept="37vLTw" id="4pp8_8SBftN" role="1m5AlR">
-                                            <ref role="3cqZAo" node="4pp8_8SwQ0e" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1V_" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="4pp8_8SBftO" role="2OqNvi">
@@ -27105,9 +27105,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4pp8_8SwQ0e" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1V_" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4pp8_8SwQ0f" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1VA" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -27267,7 +27267,7 @@
                                                       <ref role="cht4Q" to="c4fa:2I09F8VKHC0" resolve="SwitchCase" />
                                                     </node>
                                                     <node concept="37vLTw" id="4wCSdbfJH9b" role="1m5AlR">
-                                                      <ref role="3cqZAo" node="4wCSdbfJH9r" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN1VB" resolve="it" />
                                                     </node>
                                                   </node>
                                                   <node concept="3TrEf2" id="4wCSdbfJH9c" role="2OqNvi">
@@ -27283,7 +27283,7 @@
                                             <node concept="1Wc70l" id="4wCSdbfJH9f" role="3uHU7B">
                                               <node concept="2OqwBi" id="4wCSdbfJH9g" role="3uHU7B">
                                                 <node concept="37vLTw" id="4wCSdbfJH9h" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4wCSdbfJH9r" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1VB" resolve="it" />
                                                 </node>
                                                 <node concept="1mIQ4w" id="4wCSdbfJH9i" role="2OqNvi">
                                                   <node concept="chp4Y" id="4wCSdbfJH9j" role="cj9EB">
@@ -27298,7 +27298,7 @@
                                                       <ref role="cht4Q" to="c4fa:2I09F8VKHC0" resolve="SwitchCase" />
                                                     </node>
                                                     <node concept="37vLTw" id="4wCSdbfJH9o" role="1m5AlR">
-                                                      <ref role="3cqZAo" node="4wCSdbfJH9r" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN1VB" resolve="it" />
                                                     </node>
                                                   </node>
                                                   <node concept="3TrEf2" id="4wCSdbfJH9p" role="2OqNvi">
@@ -27311,9 +27311,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="4wCSdbfJH9r" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1VB" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="4wCSdbfJH9s" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1VC" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -27418,7 +27418,7 @@
                                       <node concept="3fqX7Q" id="4wCSdbfBI6X" role="3clFbG">
                                         <node concept="2OqwBi" id="4wCSdbfBI6Y" role="3fr31v">
                                           <node concept="37vLTw" id="4wCSdbfBI6Z" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4wCSdbfBHvq" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1VD" resolve="it" />
                                           </node>
                                           <node concept="1mIQ4w" id="4wCSdbfBI70" role="2OqNvi">
                                             <node concept="chp4Y" id="4wCSdbfBI71" role="cj9EB">
@@ -27429,9 +27429,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4wCSdbfBHvq" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1VD" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4wCSdbfBHvr" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1VE" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -27532,7 +27532,7 @@
                                       <node concept="3clFbF" id="4wCSdbf3EEx" role="3cqZAp">
                                         <node concept="2OqwBi" id="4wCSdbf3EEy" role="3clFbG">
                                           <node concept="37vLTw" id="4wCSdbf3EEz" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4wCSdbf3EEA" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1VF" resolve="it" />
                                           </node>
                                           <node concept="1mIQ4w" id="4wCSdbf3EE$" role="2OqNvi">
                                             <node concept="chp4Y" id="4wCSdbf3EE_" role="cj9EB">
@@ -27542,9 +27542,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4wCSdbf3EEA" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1VF" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4wCSdbf3EEB" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1VG" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -27662,7 +27662,7 @@
                                                 <node concept="36biLy" id="4wCSdbf8wZd" role="28nt2d">
                                                   <node concept="2OqwBi" id="4wCSdbf8wZe" role="36biLW">
                                                     <node concept="37vLTw" id="4wCSdbf8wZf" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4wCSdbf8x0l" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN1VH" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="4wCSdbf8wZg" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
@@ -27731,7 +27731,7 @@
                                                         <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
                                                       </node>
                                                       <node concept="37vLTw" id="4wCSdbf8wZJ" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4wCSdbf8x0l" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN1VH" resolve="it" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -27780,7 +27780,7 @@
                                                         <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
                                                       </node>
                                                       <node concept="37vLTw" id="4wCSdbf8x05" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4wCSdbf8x0l" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN1VH" resolve="it" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -27832,9 +27832,9 @@
                                     <ref role="ehGHo" to="mj1l:7igR0Vu9I1a" resolve="OrExpression" />
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4wCSdbf8x0l" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1VH" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4wCSdbf8x0m" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1VI" role="1tU5fm" />
                                 </node>
                               </node>
                               <node concept="37vLTw" id="4wCSdbf8x0n" role="1MDeny">
@@ -27891,7 +27891,7 @@
                                         <node concept="3fqX7Q" id="4pp8_8UAVCU" role="3clFbG">
                                           <node concept="2OqwBi" id="4pp8_8UyyjG" role="3fr31v">
                                             <node concept="37vLTw" id="4pp8_8UyxSb" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4pp8_8Uyx$$" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1VJ" resolve="it" />
                                             </node>
                                             <node concept="1mIQ4w" id="4pp8_8UAU$J" role="2OqNvi">
                                               <node concept="chp4Y" id="4pp8_8UAUUO" role="cj9EB">
@@ -27902,9 +27902,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4pp8_8Uyx$$" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1VJ" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4pp8_8Uyx$_" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1VK" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -28017,7 +28017,7 @@
                                         <node concept="3clFbF" id="4pp8_8U9bla" role="3cqZAp">
                                           <node concept="2OqwBi" id="4pp8_8U9blb" role="3clFbG">
                                             <node concept="37vLTw" id="4pp8_8U9blc" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4pp8_8U9blf" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN1VL" resolve="it" />
                                             </node>
                                             <node concept="1mIQ4w" id="4pp8_8U9bld" role="2OqNvi">
                                               <node concept="chp4Y" id="4pp8_8U9ble" role="cj9EB">
@@ -28027,9 +28027,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="4pp8_8U9blf" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN1VL" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="4pp8_8U9blg" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN1VM" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -28187,7 +28187,7 @@
                                                   <node concept="36biLy" id="4pp8_8U00Qn" role="28nt2d">
                                                     <node concept="2OqwBi" id="4pp8_8U9eyr" role="36biLW">
                                                       <node concept="37vLTw" id="4pp8_8U8dyx" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4pp8_8TZ_oF" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN1VN" resolve="it" />
                                                       </node>
                                                       <node concept="3TrEf2" id="4pp8_8UdoNJ" role="2OqNvi">
                                                         <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
@@ -28258,7 +28258,7 @@
                                                           <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
                                                         </node>
                                                         <node concept="37vLTw" id="4pp8_8U0$R$" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="4pp8_8TZ_oF" resolve="it" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN1VN" resolve="it" />
                                                         </node>
                                                       </node>
                                                     </node>
@@ -28309,7 +28309,7 @@
                                                           <ref role="3Tt5mk" to="c4fa:2I09F8VKHC1" resolve="expression" />
                                                         </node>
                                                         <node concept="37vLTw" id="4pp8_8U43qU" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="4pp8_8TZ_oF" resolve="it" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN1VN" resolve="it" />
                                                         </node>
                                                       </node>
                                                     </node>
@@ -28361,9 +28361,9 @@
                                       <ref role="ehGHo" to="mj1l:7igR0Vu9I1a" resolve="OrExpression" />
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4pp8_8TZ_oF" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN1VN" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4pp8_8TZ_oG" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN1VO" role="1tU5fm" />
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="4pp8_8U0N6L" role="1MDeny">
@@ -28474,7 +28474,7 @@
                                                 <ref role="cht4Q" to="c4fa:2I09F8VKHC0" resolve="SwitchCase" />
                                               </node>
                                               <node concept="37vLTw" id="4pp8_8SQzXP" role="1m5AlR">
-                                                <ref role="3cqZAo" node="4pp8_8SL$Mj" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1VP" resolve="it" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="4pp8_8SQDdQ" role="2OqNvi">
@@ -28490,7 +28490,7 @@
                                       <node concept="1Wc70l" id="4pp8_8SNRCR" role="3uHU7B">
                                         <node concept="2OqwBi" id="4pp8_8SLAsa" role="3uHU7B">
                                           <node concept="37vLTw" id="4pp8_8SL__x" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4pp8_8SL$Mj" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN1VP" resolve="it" />
                                           </node>
                                           <node concept="1mIQ4w" id="4pp8_8SNPHx" role="2OqNvi">
                                             <node concept="chp4Y" id="4pp8_8SNQvH" role="cj9EB">
@@ -28505,7 +28505,7 @@
                                                 <ref role="cht4Q" to="c4fa:2I09F8VKHC0" resolve="SwitchCase" />
                                               </node>
                                               <node concept="37vLTw" id="4pp8_8SNSwM" role="1m5AlR">
-                                                <ref role="3cqZAo" node="4pp8_8SL$Mj" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1VP" resolve="it" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="4pp8_8SNYhB" role="2OqNvi">
@@ -28518,9 +28518,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4pp8_8SL$Mj" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1VP" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4pp8_8SL$Mk" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1VQ" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -28580,7 +28580,7 @@
                                               <node concept="2OqwBi" id="Hg7g8ElO4q" role="3uHU7w">
                                                 <node concept="2OqwBi" id="Hg7g8ElwUT" role="2Oq$k0">
                                                   <node concept="37vLTw" id="Hg7g8Elw8H" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="Hg7g8DXj$D" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN1VR" resolve="it" />
                                                   </node>
                                                   <node concept="2Xjw5R" id="Hg7g8ElMSR" role="2OqNvi">
                                                     <node concept="1xMEDy" id="Hg7g8ElMST" role="1xVPHs">
@@ -28594,7 +28594,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="Hg7g8Elki2" role="3uHU7B">
                                                 <node concept="37vLTw" id="Hg7g8Eljwj" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="Hg7g8DXj$D" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1VR" resolve="it" />
                                                 </node>
                                                 <node concept="1mIQ4w" id="Hg7g8EltCg" role="2OqNvi">
                                                   <node concept="chp4Y" id="Hg7g8Elu6S" role="cj9EB">
@@ -28607,7 +28607,7 @@
                                           <node concept="3fqX7Q" id="Hg7g8DXj$$" role="3uHU7B">
                                             <node concept="2OqwBi" id="Hg7g8DXj$_" role="3fr31v">
                                               <node concept="37vLTw" id="Hg7g8DXj$A" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="Hg7g8DXj$D" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN1VR" resolve="it" />
                                               </node>
                                               <node concept="1mIQ4w" id="Hg7g8DXj$B" role="2OqNvi">
                                                 <node concept="chp4Y" id="Hg7g8DXj$C" role="cj9EB">
@@ -28619,9 +28619,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="Hg7g8DXj$D" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN1VR" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="Hg7g8DXj$E" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN1VS" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -28778,7 +28778,7 @@
                     <node concept="3clFbF" id="4LYKrgdDkL3" role="3cqZAp">
                       <node concept="2OqwBi" id="4LYKrgdDkL4" role="3clFbG">
                         <node concept="37vLTw" id="4LYKrgdDkL5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4LYKrgdDkL8" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1VT" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4LYKrgdDkL6" role="2OqNvi">
                           <node concept="chp4Y" id="7dPuStExVU5" role="cj9EB">
@@ -28788,9 +28788,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4LYKrgdDkL8" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1VT" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4LYKrgdDkL9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1VU" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -28908,7 +28908,7 @@
                                   <ref role="2pJxcJ" to="c4fa:3kEjc_WJ4oa" resolve="text" />
                                   <node concept="WxPPo" id="59cfP9u6Mlm" role="28ntcv">
                                     <node concept="37vLTw" id="6xgYZv8oUEY" role="WxPPp">
-                                      <ref role="3cqZAo" node="6xgYZv8oTiD" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1VV" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -28916,9 +28916,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6xgYZv8oTiD" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1VV" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6xgYZv8oTiE" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1VW" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps
index 3019c653e4d..6fe4b17350d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:1e8a195e-9746-45e6-a347-a6bdffae3936(com.mbeddr.core.util.behavior)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
@@ -171,7 +172,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -190,7 +191,7 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="7024111702304495340" name="jetbrains.mps.baseLanguage.structure.MulAssignmentExpression" flags="nn" index="3vZbUc" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -215,6 +216,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -360,7 +362,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -400,7 +402,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
@@ -498,7 +499,7 @@
                           <node concept="2OqwBi" id="4VEDcE28A15" role="2Oq$k0">
                             <node concept="2OqwBi" id="4VEDcE28A1$" role="2Oq$k0">
                               <node concept="37vLTw" id="4VEDcE28A0W" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4VEDcE28A0T" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1TC" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="4VEDcE28A1C" role="2OqNvi">
                                 <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
@@ -513,9 +514,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4VEDcE28A0T" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1TC" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4VEDcE28A0U" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1TD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -531,7 +532,7 @@
                       <node concept="TSZUe" id="5E5EK3C9Bdr" role="2OqNvi">
                         <node concept="2OqwBi" id="5oGU$loBVJA" role="25WWJ7">
                           <node concept="37vLTw" id="5oGU$loBVJ_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5oGU$loBVJq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1TE" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5oGU$loBVJE" role="2OqNvi">
                             <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
@@ -541,9 +542,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5oGU$loBVJq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1TE" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5oGU$loBVJr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1TF" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -605,7 +606,7 @@
                       <node concept="TSZUe" id="5E5EK3C9EOV" role="2OqNvi">
                         <node concept="2OqwBi" id="5oGU$loBVKg" role="25WWJ7">
                           <node concept="37vLTw" id="5oGU$loBVKh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5oGU$loBVKj" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1TG" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5oGU$loBVKt" role="2OqNvi">
                             <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -615,9 +616,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5oGU$loBVKj" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1TG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5oGU$loBVKk" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1TH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -679,7 +680,7 @@
                       <node concept="TSZUe" id="5E5EK3C9IzG" role="2OqNvi">
                         <node concept="2OqwBi" id="7FuBBp$HY2o" role="25WWJ7">
                           <node concept="37vLTw" id="7FuBBp$HY2p" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7FuBBp$HY2r" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1TI" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7FuBBp$HZVn" role="2OqNvi">
                             <ref role="3Tt5mk" to="x27k:6lGvXEGP3PQ" resolve="arg" />
@@ -689,9 +690,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7FuBBp$HY2r" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1TI" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7FuBBp$HY2s" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1TJ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2536,7 +2537,7 @@
                     <node concept="3clFbF" id="5u_UblVoux" role="3cqZAp">
                       <node concept="2OqwBi" id="5u_UblVo__" role="3clFbG">
                         <node concept="37vLTw" id="5u_UblVouw" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5u_UblVolK" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1TY" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5u_UblVrDP" role="2OqNvi">
                           <ref role="37wK5l" to="hwgx:7jSUHHvkAph" resolve="referencedModuleContent" />
@@ -2544,9 +2545,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5u_UblVolK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1TY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5u_UblVolL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1TZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2586,7 +2587,7 @@
                           <node concept="2yIwOk" id="79i$vAY60kS" role="2OqNvi" />
                           <node concept="2OqwBi" id="4itX8XVSOsO" role="2Oq$k0">
                             <node concept="37vLTw" id="4itX8XVSN_v" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4itX8XVS_VK" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1U0" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4itX8XVSSCp" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -2603,7 +2604,7 @@
                       <node concept="2OqwBi" id="4itX8XVSHSJ" role="3uHU7B">
                         <node concept="2OqwBi" id="4itX8XVSB4x" role="2Oq$k0">
                           <node concept="37vLTw" id="4itX8XVSAdg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4itX8XVS_VK" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1U0" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4itX8XVSFaF" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2619,9 +2620,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4itX8XVS_VK" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1U0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4itX8XVS_VL" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1U1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4473,7 +4474,7 @@
                       </node>
                       <node concept="2OqwBi" id="7kmhBx2gW$j" role="3uHU7B">
                         <node concept="37vLTw" id="7kmhBx2gWxo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7kmhBx2gWsA" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1U2" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7kmhBx2gWJX" role="2OqNvi">
                           <ref role="3Tt5mk" to="k146:7kmhBx1lIlN" resolve="error" />
@@ -4482,9 +4483,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7kmhBx2gWsA" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1U2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7kmhBx2gWsB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1U3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6172,7 +6173,7 @@
                   <node concept="3clFbF" id="1EZSCJhUF4S" role="3cqZAp">
                     <node concept="2OqwBi" id="1EZSCJhUF4T" role="3clFbG">
                       <node concept="37vLTw" id="1EZSCJhUF4U" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1EZSCJhUF4W" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1U4" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="1EZSCJhUF4V" role="2OqNvi">
                         <ref role="3Tt5mk" to="k146:1EZSCJhI$Q8" resolve="expr" />
@@ -6180,9 +6181,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1EZSCJhUF4W" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1U4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1EZSCJhUF4X" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1U5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6431,7 +6432,7 @@
                         <node concept="3fqX7Q" id="1w$GP05eO2L" role="3uHU7B">
                           <node concept="2OqwBi" id="1w$GP05eO2M" role="3fr31v">
                             <node concept="37vLTw" id="1w$GP05eO2N" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1w$GP05eNRB" resolve="stmnt" />
+                              <ref role="3cqZAo" node="2SR9xrsN1U6" resolve="stmnt" />
                             </node>
                             <node concept="1mIQ4w" id="1w$GP05eO2O" role="2OqNvi">
                               <node concept="chp4Y" id="1w$GP05eO2P" role="cj9EA">
@@ -6443,7 +6444,7 @@
                         <node concept="3fqX7Q" id="1w$GP05eO2Q" role="3uHU7w">
                           <node concept="2OqwBi" id="1w$GP05eO2R" role="3fr31v">
                             <node concept="37vLTw" id="1w$GP05eO2S" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1w$GP05eNRB" resolve="stmnt" />
+                              <ref role="3cqZAo" node="2SR9xrsN1U6" resolve="stmnt" />
                             </node>
                             <node concept="1mIQ4w" id="1w$GP05eO2T" role="2OqNvi">
                               <node concept="chp4Y" id="1w$GP05eO2U" role="cj9EA">
@@ -6457,7 +6458,7 @@
                         <node concept="2OqwBi" id="1w$GP05eO2W" role="3fr31v">
                           <node concept="2OqwBi" id="1w$GP05eO2X" role="2Oq$k0">
                             <node concept="37vLTw" id="1w$GP05eO2Y" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1w$GP05eNRB" resolve="stmnt" />
+                              <ref role="3cqZAo" node="2SR9xrsN1U6" resolve="stmnt" />
                             </node>
                             <node concept="2yIwOk" id="79i$vAY60kG" role="2OqNvi" />
                           </node>
@@ -6471,9 +6472,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1w$GP05eNRB" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1U6" role="1bW2Oz">
                   <property role="TrG5h" value="stmnt" />
-                  <node concept="2jxLKc" id="1w$GP05eNRC" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1U7" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6729,7 +6730,7 @@
                         <node concept="3clFbF" id="5_glYRwyhe_" role="3cqZAp">
                           <node concept="2OqwBi" id="5_glYRwyheA" role="3clFbG">
                             <node concept="37vLTw" id="5_glYRwyheB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5_glYRwyheD" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1U8" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5_glYRwyheC" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -6737,9 +6738,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5_glYRwyheD" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1U8" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5_glYRwyheE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1U9" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6793,7 +6794,7 @@
                         <node concept="3clFbF" id="5_glYRwyfLj" role="3cqZAp">
                           <node concept="2OqwBi" id="5_glYRwyfQn" role="3clFbG">
                             <node concept="37vLTw" id="5_glYRwyfLi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5_glYRwyfH5" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ua" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5_glYRwyg7S" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -6801,9 +6802,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5_glYRwyfH5" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ua" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5_glYRwyfH6" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Ub" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6912,7 +6913,7 @@
                       <node concept="3clFbF" id="1VqP_ItQz5w" role="3cqZAp">
                         <node concept="2OqwBi" id="1VqP_ItQzpY" role="3clFbG">
                           <node concept="37vLTw" id="1VqP_ItQz5v" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1VqP_ItQyQP" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Uc" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="1VqP_ItQzMf" role="2OqNvi">
                             <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -6920,9 +6921,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1VqP_ItQyQP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Uc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1VqP_ItQyQQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Ud" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/com.mbeddr.core.util.enumMigration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/com.mbeddr.core.util.enumMigration.mps
index b4ca5652e94..e349c51cb74 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/com.mbeddr.core.util.enumMigration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/com.mbeddr.core.util.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/constraints.mps
index 3671a5f6d97..a9b8fbbe18c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/constraints.mps
@@ -91,7 +91,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -201,7 +201,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/dataFlow.mps
index a06b5d652f7..3c84ab32e31 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/dataFlow.mps
@@ -78,7 +78,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -103,6 +103,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -181,7 +182,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -206,7 +207,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
     </language>
@@ -1088,13 +1088,13 @@
                 <node concept="3clFbS" id="6WCyKlejYVU" role="1bW5cS">
                   <node concept="3AgYrR" id="6WCyKlejYVX" role="3cqZAp">
                     <node concept="37vLTw" id="6WCyKlejYVZ" role="3Ah4Yx">
-                      <ref role="3cqZAo" node="6WCyKlejYVV" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN1Ue" resolve="it" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6WCyKlejYVV" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Ue" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6WCyKlejYVW" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Uf" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps
index 2ef263a32d3..1b9d2a582cc 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps
@@ -7,7 +7,7 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <use id="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="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -43,7 +43,7 @@
       <concept id="1402906326896143883" name="jetbrains.mps.lang.editor.structure.CellKeyMap_FunctionParm_selectedNode" flags="nn" index="0GJ7k" />
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -78,7 +78,7 @@
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="8478191136883534207" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_Selection" flags="ng" index="upBMk">
@@ -143,10 +143,10 @@
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -180,7 +180,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -214,7 +214,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -226,7 +226,7 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -359,7 +359,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -377,7 +377,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -476,7 +476,7 @@
       <concept id="4032373061957737357" name="de.slisson.mps.tables.structure.Parameter_Index" flags="ng" index="10bopy" />
       <concept id="4032373061957735279" name="de.slisson.mps.tables.structure.HeaderQuery_InsertNew" flags="ig" index="10boU0" />
       <concept id="4032373061970539014" name="de.slisson.mps.tables.structure.QueryParameter_EditorContext" flags="ng" index="1frAZD" />
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG">
@@ -583,7 +583,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/hashUtil.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/hashUtil.mps
index 1e53e351b4d..901f72180d5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/hashUtil.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/hashUtil.mps
@@ -15,7 +15,7 @@
         <child id="8441331188640771828" name="body" index="27v$W9" />
         <child id="8441331188640771827" name="condition" index="27v$We" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -51,14 +51,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -66,7 +66,7 @@
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="2093108837558505658" name="com.mbeddr.core.modules.structure.ArgumentRef" flags="ng" index="3ZUYvv">
@@ -74,7 +74,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -90,7 +90,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/intentions.mps
index 9e1233e5e51..02e57ac0931 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/intentions.mps
@@ -106,7 +106,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -132,6 +132,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -266,7 +267,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -297,7 +298,6 @@
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -921,7 +921,7 @@
                             </node>
                             <node concept="2OqwBi" id="2EBw14y26vR" role="3uHU7B">
                               <node concept="37vLTw" id="2EBw14y26vS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2EBw14y26vU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Ug" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2EBw14y26vT" role="2OqNvi">
                                 <ref role="3Tt5mk" to="k146:2EBw14y1Xqq" resolve="element" />
@@ -930,9 +930,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2EBw14y26vU" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ug" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2EBw14y26vV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Uh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1671,7 +1671,7 @@
                         <node concept="3clFbF" id="6txSgm$M29b" role="3cqZAp">
                           <node concept="2OqwBi" id="6txSgm$M29c" role="3clFbG">
                             <node concept="37vLTw" id="6txSgm$M29d" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6txSgm$M29f" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Ui" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6txSgm$M29e" role="2OqNvi">
                               <ref role="3TtcxE" to="k146:4itX8XUPkC1" resolve="items" />
@@ -1679,9 +1679,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6txSgm$M29f" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Ui" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6txSgm$M29g" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Uj" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2286,7 +2286,7 @@
                     <node concept="3clFbF" id="1YMKWAVyWgG" role="3cqZAp">
                       <node concept="2OqwBi" id="1YMKWAVyWgH" role="3clFbG">
                         <node concept="37vLTw" id="1YMKWAVyWgI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1YMKWAVyWgK" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Uk" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="1YMKWAVyWgJ" role="2OqNvi">
                           <ref role="3TtcxE" to="k146:4itX8XUPkC1" resolve="items" />
@@ -2294,9 +2294,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1YMKWAVyWgK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Uk" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1YMKWAVyWgL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Ul" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/scripts.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/scripts.mps
index a90e0cd4941..0c0ba340ad6 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/scripts.mps
@@ -31,7 +31,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -61,7 +61,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps
index 2f5aacd2670..6d65a0283e8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
@@ -129,7 +129,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -151,6 +151,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -371,7 +372,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -407,7 +408,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -1332,7 +1332,7 @@
                           <node concept="10Nm6u" id="5oFMniD7nxQ" role="3uHU7w" />
                           <node concept="2OqwBi" id="5oFMniD7nxI" role="3uHU7B">
                             <node concept="37vLTw" id="5oFMniD7nxH" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3Krj9ItjNrw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Um" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="5oFMniD7nxM" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1342,7 +1342,7 @@
                         <node concept="2OqwBi" id="3Krj9ItjNrD" role="3uHU7w">
                           <node concept="2OqwBi" id="3Krj9ItjNr$" role="2Oq$k0">
                             <node concept="37vLTw" id="3Krj9ItjNrz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3Krj9ItjNrw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Um" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3Krj9ItjNrC" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1363,9 +1363,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3Krj9ItjNrw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Um" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3Krj9ItjNrx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Un" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3755,7 +3755,7 @@
                   <node concept="3clFbF" id="4wa2CIlQBvO" role="3cqZAp">
                     <node concept="2OqwBi" id="4wa2CIlQBvP" role="3clFbG">
                       <node concept="37vLTw" id="4wa2CIlQBvQ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4wa2CIlQBvS" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Uo" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4wa2CIlQBvR" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:6ucVliiGyWC" resolve="isSuppressionAllowed" />
@@ -3763,9 +3763,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4wa2CIlQBvS" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Uo" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4wa2CIlQBvT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Up" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3796,7 +3796,7 @@
                   <node concept="3clFbF" id="4wa2CIlQCJK" role="3cqZAp">
                     <node concept="2OqwBi" id="4wa2CIlQCJL" role="3clFbG">
                       <node concept="37vLTw" id="4wa2CIlQCJM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4wa2CIlQCJO" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN1Uq" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4wa2CIlQCJN" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:6ucVliiGyWC" resolve="isSuppressionAllowed" />
@@ -3804,9 +3804,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4wa2CIlQCJO" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Uq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4wa2CIlQCJP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ur" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6523,7 +6523,7 @@
                       </node>
                       <node concept="2OqwBi" id="7kmhBx2NNF3" role="3uHU7B">
                         <node concept="37vLTw" id="7kmhBx2NXEY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7kmhBx2NXqz" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1Us" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7kmhBx2NO4I" role="2OqNvi">
                           <ref role="3Tt5mk" to="k146:7kmhBx0TVwl" resolve="error" />
@@ -6532,9 +6532,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7kmhBx2NXqz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN1Us" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7kmhBx2NXq$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN1Ut" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8059,7 +8059,7 @@
                 <node concept="Jncv_" id="3PUmE2mjttT" role="3cqZAp">
                   <ref role="JncvD" to="87nw:2dWzqxEBMSc" resolve="Word" />
                   <node concept="37vLTw" id="3PUmE2mjtGk" role="JncvB">
-                    <ref role="3cqZAo" node="3PUmE2mjr8M" resolve="it" />
+                    <ref role="3cqZAo" node="2SR9xrsN1Uu" resolve="it" />
                   </node>
                   <node concept="3clFbS" id="3PUmE2mjttX" role="Jncv$">
                     <node concept="3clFbJ" id="3PUmE2mdcQ5" role="3cqZAp">
@@ -8081,7 +8081,7 @@
                                   <ref role="cht4Q" to="87nw:2dWzqxEBMSc" resolve="Word" />
                                 </node>
                                 <node concept="37vLTw" id="3PUmE2mjB69" role="1m5AlR">
-                                  <ref role="3cqZAo" node="3PUmE2mjr8M" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN1Uu" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -8145,9 +8145,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="3PUmE2mjr8M" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN1Uu" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="3PUmE2mjr8N" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN1Uv" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps
index 82ff2dc1b47..99c79d5abb0 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps
@@ -2,8 +2,8 @@
 <model ref="r:ce72d29b-3d3e-4ef3-809e-155db4cf8f41(com.mbeddr.core.util.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="306d7456-29e2-4ea3-9c46-e7b830b08481" name="com.mbeddr.mpsutil.process" version="-1" />
@@ -75,6 +75,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
         <property id="7458746815261976739" name="requiredAccess" index="2YLI8m" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -98,7 +99,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -136,7 +137,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -261,7 +262,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -292,7 +293,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -348,6 +349,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -405,7 +407,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -481,7 +483,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -543,7 +545,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
@@ -561,6 +562,7 @@
     <property role="2uzpH1" value="Create New mbeddr Solution" />
     <property role="3GE5qa" value="wizards" />
     <property role="2YLI8m" value="6u2MFnph2wS/none" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="1ptFCtLqsw4" role="tncku">
       <node concept="3clFbS" id="1ptFCtLqsw5" role="2VODD2">
         <node concept="3cpWs8" id="2c_RKbQeEkc" role="3cqZAp">
@@ -626,6 +628,7 @@
     <property role="2uzpH1" value="Create Minimal System" />
     <property role="3GE5qa" value="wizards" />
     <property role="2YLI8m" value="6u2MFnph2wS/none" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="78Ts1skpdx3" role="tncku">
       <node concept="3clFbS" id="78Ts1skpdx4" role="2VODD2">
         <node concept="3clFbH" id="78Ts1skpiUv" role="3cqZAp" />
@@ -2505,6 +2508,7 @@
     <property role="3GE5qa" value="wizards.project" />
     <property role="TrG5h" value="createNewMbeddrProject" />
     <property role="2uzpH1" value="mbeddr Project" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="2cNe_D166j7" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
@@ -2773,15 +2777,15 @@
                           <node concept="liA8E" id="7o1blyuBD10" role="2OqNvi">
                             <ref role="37wK5l" to="fyhk:~VisibleModuleRegistry.isVisible(org.jetbrains.mps.openapi.module.SModule)" resolve="isVisible" />
                             <node concept="37vLTw" id="7o1blyuBD3v" role="37wK5m">
-                              <ref role="3cqZAo" node="7o1blyuBC57" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2_o" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7o1blyuBC57" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2_o" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7o1blyuBC58" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2_p" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2797,15 +2801,15 @@
                         <node concept="liA8E" id="7o1blyuBG$T" role="2OqNvi">
                           <ref role="37wK5l" to="d244:2qDF1txKjM_" resolve="filter" />
                           <node concept="37vLTw" id="7o1blyuBGEE" role="37wK5m">
-                            <ref role="3cqZAo" node="7o1blyuBFfv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2_q" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7o1blyuBFfv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2_q" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7o1blyuBFfw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2_r" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2820,15 +2824,15 @@
                       </node>
                       <node concept="TSZUe" id="71iDQGhak1h" role="2OqNvi">
                         <node concept="37vLTw" id="71iDQGhakdj" role="25WWJ7">
-                          <ref role="3cqZAo" node="7o1blyuBN7F" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_s" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7o1blyuBN7F" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2_s" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7o1blyuBN7G" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2_t" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3036,7 +3040,7 @@
                   <node concept="3clFbF" id="71iDQGhatn6" role="3cqZAp">
                     <node concept="2OqwBi" id="71iDQGhatEZ" role="3clFbG">
                       <node concept="37vLTw" id="71iDQGhatn5" role="2Oq$k0">
-                        <ref role="3cqZAo" node="71iDQGhat8V" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2_u" resolve="it" />
                       </node>
                       <node concept="liA8E" id="71iDQGhau6f" role="2OqNvi">
                         <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
@@ -3044,9 +3048,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="71iDQGhat8V" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2_u" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="71iDQGhat8W" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2_v" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5848,7 +5852,7 @@
                         <node concept="3clFbF" id="2cNe_D17JAJ" role="3cqZAp">
                           <node concept="2OqwBi" id="2cNe_D17JAK" role="3clFbG">
                             <node concept="37vLTw" id="2cNe_D17JAL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2cNe_D17JAN" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2_w" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2cNe_D17JAM" role="2OqNvi">
                               <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
@@ -5856,9 +5860,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2cNe_D17JAN" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2_w" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2cNe_D17JAO" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2_x" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5986,7 +5990,7 @@
                           <node concept="3JPx81" id="2cNe_D17JBq" role="2OqNvi">
                             <node concept="2OqwBi" id="2cNe_D17JBr" role="25WWJ7">
                               <node concept="37vLTw" id="2cNe_D17JBs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2cNe_D17JBu" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2_y" resolve="it" />
                               </node>
                               <node concept="liA8E" id="2cNe_D17JBt" role="2OqNvi">
                                 <ref role="37wK5l" to="dxuu:~AbstractButton.getText()" resolve="getText" />
@@ -5996,9 +6000,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2cNe_D17JBu" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2_y" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2cNe_D17JBv" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2_z" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6009,7 +6013,7 @@
                     <node concept="3clFbF" id="2cNe_D17JBz" role="3cqZAp">
                       <node concept="2OqwBi" id="2cNe_D17JB$" role="3clFbG">
                         <node concept="37vLTw" id="2cNe_D17JB_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2cNe_D17JBC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_$" resolve="it" />
                         </node>
                         <node concept="liA8E" id="2cNe_D17JBA" role="2OqNvi">
                           <ref role="37wK5l" to="dxuu:~AbstractButton.setSelected(boolean)" resolve="setSelected" />
@@ -6020,9 +6024,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2cNe_D17JBC" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2_$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2cNe_D17JBD" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2__" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6466,7 +6470,7 @@
                                                           <node concept="2OqwBi" id="1B5fOaAXHW7" role="3clFbG">
                                                             <node concept="2OqwBi" id="1B5fOaAXHW8" role="2Oq$k0">
                                                               <node concept="37vLTw" id="1B5fOaAXHW9" role="2Oq$k0">
-                                                                <ref role="3cqZAo" node="1B5fOaAXHWf" resolve="it" />
+                                                                <ref role="3cqZAo" node="2SR9xrsN2_A" resolve="it" />
                                                               </node>
                                                               <node concept="liA8E" id="1B5fOaAXHWa" role="2OqNvi">
                                                                 <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
@@ -6486,9 +6490,9 @@
                                                           </node>
                                                         </node>
                                                       </node>
-                                                      <node concept="Rh6nW" id="1B5fOaAXHWf" role="1bW2Oz">
+                                                      <node concept="gl6BB" id="2SR9xrsN2_A" role="1bW2Oz">
                                                         <property role="TrG5h" value="it" />
-                                                        <node concept="2jxLKc" id="1B5fOaAXHWg" role="1tU5fm" />
+                                                        <node concept="2jxLKc" id="2SR9xrsN2_B" role="1tU5fm" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -6507,7 +6511,7 @@
                                                 <node concept="3clFbF" id="1B5fOaAXHWm" role="3cqZAp">
                                                   <node concept="2OqwBi" id="1B5fOaAXHWn" role="3clFbG">
                                                     <node concept="37vLTw" id="1B5fOaAXHWo" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="1B5fOaAXHWq" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2_C" resolve="it" />
                                                     </node>
                                                     <node concept="liA8E" id="1B5fOaAXHWp" role="2OqNvi">
                                                       <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
@@ -6515,9 +6519,9 @@
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="Rh6nW" id="1B5fOaAXHWq" role="1bW2Oz">
+                                              <node concept="gl6BB" id="2SR9xrsN2_C" role="1bW2Oz">
                                                 <property role="TrG5h" value="it" />
-                                                <node concept="2jxLKc" id="1B5fOaAXHWr" role="1tU5fm" />
+                                                <node concept="2jxLKc" id="2SR9xrsN2_D" role="1tU5fm" />
                                               </node>
                                             </node>
                                           </node>
@@ -6686,6 +6690,7 @@
     <property role="2uzpH1" value="mbeddr Solution" />
     <property role="3GE5qa" value="wizards" />
     <property role="2YLI8m" value="6u2MFnph2wS/none" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="7sfu2B6B1Z$" role="tncku">
       <node concept="3clFbS" id="7sfu2B6B1Z_" role="2VODD2">
         <node concept="3cpWs8" id="7sfu2B6B1ZA" role="3cqZAp">
@@ -7901,7 +7906,7 @@
                         <node concept="3clFbF" id="1MUu1mkZa03" role="3cqZAp">
                           <node concept="2OqwBi" id="1MUu1mkZa9V" role="3clFbG">
                             <node concept="37vLTw" id="1MUu1mkZa02" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1MUu1mkZ9KP" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2_E" resolve="it" />
                             </node>
                             <node concept="liA8E" id="1MUu1mkZapX" role="2OqNvi">
                               <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
@@ -7909,9 +7914,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1MUu1mkZ9KP" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2_E" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1MUu1mkZ9KQ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2_F" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8039,7 +8044,7 @@
                           <node concept="3JPx81" id="1MUu1mkZ13j" role="2OqNvi">
                             <node concept="2OqwBi" id="1MUu1mkYZHL" role="25WWJ7">
                               <node concept="37vLTw" id="1MUu1mkYZBu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1MUu1mkYZwY" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2_G" resolve="it" />
                               </node>
                               <node concept="liA8E" id="1MUu1mkZ0bQ" role="2OqNvi">
                                 <ref role="37wK5l" to="dxuu:~AbstractButton.getText()" resolve="getText" />
@@ -8049,9 +8054,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1MUu1mkYZwY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2_G" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1MUu1mkYZwZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2_H" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8062,7 +8067,7 @@
                     <node concept="3clFbF" id="1MUu1mkZgrG" role="3cqZAp">
                       <node concept="2OqwBi" id="1MUu1mkZgzx" role="3clFbG">
                         <node concept="37vLTw" id="1MUu1mkZgrF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1MUu1mkZgiw" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_I" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1MUu1mkZhwc" role="2OqNvi">
                           <ref role="37wK5l" to="dxuu:~AbstractButton.setSelected(boolean)" resolve="setSelected" />
@@ -8073,9 +8078,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1MUu1mkZgiw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2_I" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1MUu1mkZgix" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2_J" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8313,7 +8318,7 @@
                               <node concept="2OqwBi" id="6e58Udrb8bw" role="3clFbG">
                                 <node concept="2OqwBi" id="6e58UdraXoj" role="2Oq$k0">
                                   <node concept="37vLTw" id="6e58UdraWQL" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6e58UdraW1s" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2_K" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="6e58UdraZQ3" role="2OqNvi">
                                     <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
@@ -8333,9 +8338,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6e58UdraW1s" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2_K" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6e58UdraW1t" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2_L" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -8354,7 +8359,7 @@
                     <node concept="3clFbF" id="6e58Udra$rs" role="3cqZAp">
                       <node concept="2OqwBi" id="6e58Udra$W6" role="3clFbG">
                         <node concept="37vLTw" id="6e58Udra$rr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6e58UdrazEB" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_M" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6e58UdraAwd" role="2OqNvi">
                           <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
@@ -8362,9 +8367,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6e58UdrazEB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2_M" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6e58UdrazEC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2_N" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd
index cee096d3c9a..93e25341641 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.util.pluginSolution" uuid="e5fe54ab-c20f-4431-a7e7-76e843f58498" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.util.pluginSolution" uuid="e5fe54ab-c20f-4431-a7e7-76e843f58498" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -38,11 +37,11 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -104,7 +103,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl
index 3001bba89cf..ed2edd4e02a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl
@@ -59,7 +59,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -131,7 +131,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -342,7 +341,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -380,7 +378,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -463,7 +461,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd
index 9a266ba3570..1366e31f8fa 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.expressions.interpreter" uuid="679ff375-ddae-46fa-9503-1507abcab123" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.expressions.interpreter" uuid="679ff375-ddae-46fa-9503-1507abcab123" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/models/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/models/plugin.mps
index 74aa65305a5..2056e8ea80a 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/models/plugin.mps
@@ -135,7 +135,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -260,7 +260,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd
index 90681cb627a..0174657c400 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.expressions.runtime" uuid="984f0332-8a86-4f5c-9184-03eae96b5d16" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.expressions.runtime" uuid="984f0332-8a86-4f5c-9184-03eae96b5d16" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/models/com/mbeddr/core/expressions/runtime/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/models/com/mbeddr/core/expressions/runtime/plugin.mps
index fd642839743..744e02ae347 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/models/com/mbeddr/core/expressions/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/models/com/mbeddr/core/expressions/runtime/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:ffb23717-2675-4f36-b47c-a7d3b95c99a7(com.mbeddr.core.expressions.runtime.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -27,7 +27,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -121,7 +121,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -141,7 +141,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -169,7 +169,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 3f348fb0291..2733ff14f74 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.interpreterdebugger.rt" uuid="ae8e7a60-5354-43ad-9940-4de2bfa01348" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.interpreterdebugger.rt" uuid="ae8e7a60-5354-43ad-9940-4de2bfa01348" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -19,7 +18,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/models/com/mbeddr/core/interpreterdebugger/rt/runtime.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/models/com/mbeddr/core/interpreterdebugger/rt/runtime.mps
index e60ed9264e9..16614701137 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/models/com/mbeddr/core/interpreterdebugger/rt/runtime.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/models/com/mbeddr/core/interpreterdebugger/rt/runtime.mps
@@ -112,7 +112,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -132,7 +132,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -146,6 +146,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -182,7 +183,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -217,7 +218,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
       <concept id="1240217271293" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashSetCreator" flags="nn" index="32HrFt" />
@@ -614,14 +614,14 @@
                       <node concept="1rXfSq" id="2BbcAuIh4Z8" role="3clFbG">
                         <ref role="37wK5l" node="2BbcAuIh1s$" resolve="createDebugKey" />
                         <node concept="37vLTw" id="2BbcAuIh61V" role="37wK5m">
-                          <ref role="3cqZAo" node="4N5UlZR7mYc" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2_O" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4N5UlZR7mYc" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2_O" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4N5UlZR7mYd" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2_P" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1278,7 +1278,7 @@
                     <node concept="1rXfSq" id="3$DH87aGDzk" role="3clFbG">
                       <ref role="37wK5l" node="3$DH87aG$ie" resolve="setShowDebugger" />
                       <node concept="37vLTw" id="3$DH87aGDAq" role="37wK5m">
-                        <ref role="3cqZAo" node="3$DH87aGDwK" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2_Q" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="3$DH87aGDEF" role="37wK5m">
                         <ref role="3cqZAo" node="3$DH87aGA9x" resolve="show" />
@@ -1286,9 +1286,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3$DH87aGDwK" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2_Q" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3$DH87aGDwL" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2_R" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd
index fd8444e6679..f3dc9700890 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.legacy.interpreter" uuid="02bfb1d1-3e63-492d-a462-6b43ed4b8092" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.legacy.interpreter" uuid="02bfb1d1-3e63-492d-a462-6b43ed4b8092" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">ad5e9db1-9600-47c7-86ef-614165b281b8(com.mbeddr.core.legacy)</dependency>
@@ -19,7 +18,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/models/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/models/plugin.mps
index 29a39894b1d..a1a8866eefa 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/models/plugin.mps
@@ -53,7 +53,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd
index 233685e6bbd..1bd3f51d5fe 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.modules.interpreter" uuid="0cd30297-1008-4fe3-a5a6-b83d052eb14b" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.modules.interpreter" uuid="0cd30297-1008-4fe3-a5a6-b83d052eb14b" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">6d93942a-3b4d-4740-b028-3a7923efb867(com.mbeddr.core.statements.interpreter)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -75,7 +74,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/models/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/models/plugin.mps
index 249231205f0..53089c716f1 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -36,7 +36,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -101,7 +101,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd
index 3b78f5aadc8..068667999a5 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.pointers.interpreter" uuid="5b171c3c-2358-468b-a51d-d46692a0c5ff" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.pointers.interpreter" uuid="5b171c3c-2358-468b-a51d-d46692a0c5ff" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/models/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/models/plugin.mps
index c3a4482bfea..ed84bf08bd4 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/models/plugin.mps
@@ -38,7 +38,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -86,7 +86,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd
index dc15686c475..104cff7f995 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.statements.interpreter" uuid="6d93942a-3b4d-4740-b028-3a7923efb867" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.statements.interpreter" uuid="6d93942a-3b4d-4740-b028-3a7923efb867" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -76,7 +75,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/models/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/models/plugin.mps
index 5cdb177ee77..89b55ca9439 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -69,7 +69,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -156,7 +156,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd
index a93f7545319..ecab0d9fd27 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.stdlib" uuid="2ed50273-af07-4e30-9004-b1f89545178a" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.core.stdlib" uuid="2ed50273-af07-4e30-9004-b1f89545178a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps
index 28900f965fd..e7ee14654d0 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps
@@ -16,7 +16,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -90,7 +90,7 @@
       <concept id="3788988821852026523" name="com.mbeddr.core.modules.structure.GlobalConstantRef" flags="ng" index="4ZOvp">
         <reference id="3376775282622611130" name="constant" index="2DPCA0" />
       </concept>
-      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ng" index="k8FjF">
+      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ngI" index="k8FjF">
         <child id="883533952987441014" name="kind" index="3U$Ho4" />
       </concept>
       <concept id="8551646674110484035" name="com.mbeddr.core.modules.structure.FunctionRefExpr" flags="ng" index="pF0ck">
@@ -126,17 +126,17 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -152,7 +152,7 @@
         <reference id="7308356872494660982" name="arg" index="39I4aG" />
       </concept>
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -172,7 +172,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -201,7 +201,7 @@
       <concept id="3869525881267643673" name="com.mbeddr.core.expressions.structure.SSizeT" flags="ng" index="2B$3hg" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="1136530067488156615" name="com.mbeddr.core.expressions.structure.BitwiseORExpression" flags="ng" index="EUQZk" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps
index b325af99a44..3130c282f81 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps
@@ -14,7 +14,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -70,7 +70,7 @@
       <concept id="3788988821852026523" name="com.mbeddr.core.modules.structure.GlobalConstantRef" flags="ng" index="4ZOvp">
         <reference id="3376775282622611130" name="constant" index="2DPCA0" />
       </concept>
-      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ng" index="k8FjF">
+      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ngI" index="k8FjF">
         <child id="883533952987441014" name="kind" index="3U$Ho4" />
       </concept>
       <concept id="8551646674110395547" name="com.mbeddr.core.modules.structure.FunctionRefType" flags="ng" index="pFrBc">
@@ -93,17 +93,17 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -113,7 +113,7 @@
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="6610873504380335822" name="com.mbeddr.core.modules.structure.GlobalVariableDeclaration" flags="ng" index="1S7NMz">
@@ -133,7 +133,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -160,7 +160,7 @@
       <concept id="9149785691754701072" name="com.mbeddr.core.expressions.structure.LongDoubleType" flags="ng" index="2p1N2b" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="595416243537320771" name="com.mbeddr.core.expressions.structure.UnsignedShortType" flags="ng" index="LMkMC" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps
index 4cb47968c47..54d7e1177f0 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps
@@ -12,7 +12,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
     </language>
@@ -94,17 +94,17 @@
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
       <concept id="1052812498335653322" name="com.mbeddr.core.modules.structure.VariadicArgument" flags="ng" index="2GZKED" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -116,7 +116,7 @@
         <reference id="7308356872494660982" name="arg" index="39I4aG" />
       </concept>
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
     </language>
@@ -125,7 +125,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -147,7 +147,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="1136530067488156615" name="com.mbeddr.core.expressions.structure.BitwiseORExpression" flags="ng" index="EUQZk" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd
index 61148ab54be..2f4f4f821ec 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.core.util.interpreter" uuid="c4707a9d-e0c7-4c73-a63d-5f38d8a4ebc9" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.core.util.interpreter" uuid="c4707a9d-e0c7-4c73-a63d-5f38d8a4ebc9" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -75,7 +74,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/models/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/models/plugin.mps
index 1cb79ef1ca2..527f6f1e543 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
@@ -71,7 +71,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -119,6 +119,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -145,7 +146,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -157,7 +158,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -199,16 +199,16 @@
                               </node>
                               <node concept="qpA2v" id="3VM1o5wb$Ce" role="10QFUP">
                                 <node concept="37vLTw" id="3VM1o5wb$Cf" role="3SLO0q">
-                                  <ref role="3cqZAo" node="3VM1o5wb$Cg" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2_S" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3VM1o5wb$Cg" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2_S" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3VM1o5wb$Ch" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2_T" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -239,16 +239,16 @@
                               </node>
                               <node concept="qpA2v" id="3VM1o5wb$Cw" role="10QFUP">
                                 <node concept="37vLTw" id="3VM1o5wb$Cx" role="3SLO0q">
-                                  <ref role="3cqZAo" node="3VM1o5wb$Cy" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2_U" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3VM1o5wb$Cy" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2_U" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3VM1o5wb$Cz" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2_V" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -346,9 +346,9 @@
           </node>
           <node concept="2HxqBE" id="3VM1o5wb$Dh" role="2OqNvi">
             <node concept="1bVj0M" id="3VM1o5wb$Di" role="23t8la">
-              <node concept="Rh6nW" id="3VM1o5wb$Dj" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2_W" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="3VM1o5wb$Dk" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2_X" role="1tU5fm" />
               </node>
               <node concept="3clFbS" id="3VM1o5wb$Dl" role="1bW5cS">
                 <node concept="3cpWs8" id="3VM1o5wb$Dm" role="3cqZAp">
@@ -357,7 +357,7 @@
                     <node concept="10P_77" id="3VM1o5wb$Do" role="1tU5fm" />
                     <node concept="3SLO07" id="3VM1o5wb$Dp" role="33vP2m">
                       <node concept="37vLTw" id="3VM1o5wb$Dq" role="3SLO0q">
-                        <ref role="3cqZAo" node="3VM1o5wb$Dj" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2_W" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -381,7 +381,7 @@
                             </node>
                             <node concept="2OqwBi" id="6tcu$9ntG2$" role="3uHU7w">
                               <node concept="37vLTw" id="3VM1o5wb$D$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3VM1o5wb$Dj" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2_W" resolve="it" />
                               </node>
                               <node concept="2Iv5rx" id="6tcu$9ntG2_" role="2OqNvi" />
                             </node>
@@ -433,7 +433,7 @@
                               <node concept="qpA2v" id="3VM1o5wb$DT" role="10QFUP">
                                 <node concept="2OqwBi" id="3VM1o5wb$DU" role="3SLO0q">
                                   <node concept="37vLTw" id="3VM1o5wb$DV" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3VM1o5wb$DY" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2_Y" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="3VM1o5wb$DW" role="2OqNvi">
                                     <ref role="3Tt5mk" to="k146:5oGU$loBRJC" resolve="condition" />
@@ -447,9 +447,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3VM1o5wb$DY" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2_Y" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3VM1o5wb$DZ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2_Z" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/com.mbeddr.tutorialActions.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/com.mbeddr.tutorialActions.msd
index f12b9a23a76..3661573fd76 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/com.mbeddr.tutorialActions.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/com.mbeddr.tutorialActions.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.tutorialActions" uuid="67bb4292-5764-4379-a6b4-bc02c3aac00e" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.tutorialActions" uuid="67bb4292-5764-4379-a6b4-bc02c3aac00e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps
index 0884f2cabe3..4e8385ad3c4 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps
@@ -9,7 +9,6 @@
   <imports>
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
@@ -24,7 +23,6 @@
     <import index="jlff" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.vfs(MPS.IDEA/)" />
     <import index="ofh9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.platform(MPS.IDEA/)" />
     <import index="btn2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.impl(MPS.IDEA/)" />
-    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="eoo2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.file(JDK/)" />
   </imports>
   <registry>
@@ -50,7 +48,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -106,7 +104,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -167,7 +165,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -190,7 +188,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -250,8 +248,15 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261755" name="throwable" index="RRSow" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
+      </concept>
+    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -266,21 +271,7 @@
   </registry>
   <node concept="312cEu" id="7836$RyVVLX">
     <property role="TrG5h" value="MbeddrTutorialExtractor" />
-    <node concept="Wx3nA" id="7836$RyVWjJ" role="jymVt">
-      <property role="TrG5h" value="LOG" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3uibUv" id="7836$RyVWjK" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
-      </node>
-      <node concept="2YIFZM" id="7836$RyVZuA" role="33vP2m">
-        <ref role="1Pybhc" to="q7tw:~LogManager" resolve="LogManager" />
-        <ref role="37wK5l" to="q7tw:~LogManager.getLogger(java.lang.Class)" resolve="getLogger" />
-        <node concept="3VsKOn" id="7836$RyVWjN" role="37wK5m">
-          <ref role="3VsUkX" node="7836$RyVVLX" resolve="MbeddrTutorialExtractor" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="7836$RyVWjO" role="1B3o_S" />
-    </node>
+    <node concept="2tJIrI" id="3GgspuIYB$d" role="jymVt" />
     <node concept="2tJIrI" id="35jXaZBM65z" role="jymVt" />
     <node concept="Wx3nA" id="7836$RyVWjP" role="jymVt">
       <property role="TrG5h" value="SAMPLES_IN_MPS_HOME_DIR" />
@@ -1251,18 +1242,11 @@
               </node>
             </node>
             <node concept="3clFbS" id="7836$RyVWp4" role="1zc67A">
-              <node concept="3clFbF" id="7836$RyVWp5" role="3cqZAp">
-                <node concept="2OqwBi" id="7836$RyVWr3" role="3clFbG">
-                  <node concept="37vLTw" id="7836$RyVWr2" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7836$RyVWjJ" resolve="LOG" />
-                  </node>
-                  <node concept="liA8E" id="7836$RyVWr4" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="10Nm6u" id="7836$RyVWp7" role="37wK5m" />
-                    <node concept="37vLTw" id="7836$RyVWp8" role="37wK5m">
-                      <ref role="3cqZAo" node="7836$RyVWp0" resolve="e" />
-                    </node>
-                  </node>
+              <node concept="RRSsy" id="3GgspuIYx41" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fh_4/error" />
+                <node concept="Xl_RD" id="3GgspuIYx43" role="RRSoy" />
+                <node concept="37vLTw" id="3GgspuIY_uR" role="RRSow">
+                  <ref role="3cqZAo" node="7836$RyVWp0" resolve="e" />
                 </node>
               </node>
             </node>
@@ -1556,58 +1540,19 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWs8" id="7836$RyWXkT" role="3cqZAp">
-                  <node concept="3cpWsn" id="7836$RyWXkS" role="3cpWs9">
-                    <property role="3TUv4t" value="false" />
-                    <property role="TrG5h" value="project" />
-                    <node concept="3uibUv" id="7836$RyWXkU" role="1tU5fm">
-                      <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-                    </node>
-                    <node concept="2YIFZM" id="1VRNFInKmSV" role="33vP2m">
-                      <ref role="37wK5l" to="btn2:~ProjectUtil.openProject(java.nio.file.Path,com.intellij.ide.impl.OpenProjectTask)" resolve="openProject" />
-                      <ref role="1Pybhc" to="btn2:~ProjectUtil" resolve="ProjectUtil" />
-                      <node concept="2YIFZM" id="1VRNFInKqGD" role="37wK5m">
-                        <ref role="37wK5l" to="eoo2:~Paths.get(java.lang.String,java.lang.String...)" resolve="get" />
-                        <ref role="1Pybhc" to="eoo2:~Paths" resolve="Paths" />
-                        <node concept="37vLTw" id="1VRNFInKrSz" role="37wK5m">
-                          <ref role="3cqZAo" node="7836$RyWXkO" resolve="filePath" />
-                        </node>
+                <node concept="3clFbF" id="4_tgWKb89aH" role="3cqZAp">
+                  <node concept="2YIFZM" id="1VRNFInKmSV" role="3clFbG">
+                    <ref role="37wK5l" to="btn2:~ProjectUtil.openProject(java.nio.file.Path,com.intellij.ide.impl.OpenProjectTask)" resolve="openProject" />
+                    <ref role="1Pybhc" to="btn2:~ProjectUtil" resolve="ProjectUtil" />
+                    <node concept="2YIFZM" id="1VRNFInKqGD" role="37wK5m">
+                      <ref role="37wK5l" to="eoo2:~Paths.get(java.lang.String,java.lang.String...)" resolve="get" />
+                      <ref role="1Pybhc" to="eoo2:~Paths" resolve="Paths" />
+                      <node concept="37vLTw" id="1VRNFInKrSz" role="37wK5m">
+                        <ref role="3cqZAo" node="7836$RyWXkO" resolve="filePath" />
                       </node>
-                      <node concept="37vLTw" id="1VRNFInKmSX" role="37wK5m">
-                        <ref role="3cqZAo" node="1VRNFInKbww" resolve="task" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="7836$RyWXkZ" role="3cqZAp">
-                  <node concept="3y3z36" id="7836$RyWXl0" role="3clFbw">
-                    <node concept="37vLTw" id="7836$RyWXl1" role="3uHU7B">
-                      <ref role="3cqZAo" node="7836$RyWXkS" resolve="project" />
                     </node>
-                    <node concept="10Nm6u" id="7836$RyWXl2" role="3uHU7w" />
-                  </node>
-                  <node concept="3clFbS" id="7836$RyWXl4" role="3clFbx">
-                    <node concept="3clFbF" id="7836$RyWXl5" role="3cqZAp">
-                      <node concept="2OqwBi" id="7836$RyWXl6" role="3clFbG">
-                        <node concept="2YIFZM" id="7836$RyXbKo" role="2Oq$k0">
-                          <ref role="1Pybhc" to="ofh9:~ProjectBaseDirectory" resolve="ProjectBaseDirectory" />
-                          <ref role="37wK5l" to="ofh9:~ProjectBaseDirectory.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
-                          <node concept="37vLTw" id="7836$RyWXl8" role="37wK5m">
-                            <ref role="3cqZAo" node="7836$RyWXkS" resolve="project" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="7836$RyWXl9" role="2OqNvi">
-                          <ref role="37wK5l" to="ofh9:~ProjectBaseDirectory.setBaseDir(com.intellij.openapi.vfs.VirtualFile)" resolve="setBaseDir" />
-                          <node concept="2OqwBi" id="7836$RyWXmh" role="37wK5m">
-                            <node concept="37vLTw" id="7836$RyWXmg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7836$RyWXkS" resolve="project" />
-                            </node>
-                            <node concept="liA8E" id="7836$RyWXmi" role="2OqNvi">
-                              <ref role="37wK5l" to="4nm9:~Project.getBaseDir()" resolve="getBaseDir" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="37vLTw" id="1VRNFInKmSX" role="37wK5m">
+                      <ref role="3cqZAo" node="1VRNFInKbww" resolve="task" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd
index 32087feaf93..cd06e8eeb7e 100644
--- a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd
+++ b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="aLibrary" uuid="ac9da4f2-d564-40a2-a35a-213ed1655172" moduleVersion="0" compileInMPS="true">
+<solution name="aLibrary" uuid="ac9da4f2-d564-40a2-a35a-213ed1655172" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -12,7 +12,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates(com.mbeddr.core.__spreferences.PlatformTemplates)</dependency>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
@@ -46,7 +45,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary/dummy@tests.mps b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary/dummy@tests.mps
index 947ccc4804d..ff1e92ff426 100644
--- a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary/dummy@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary/dummy@tests.mps
@@ -18,7 +18,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
diff --git a/code/languages/com.mbeddr.core/tests/aLibrary/models/aLibrary.lib.mps b/code/languages/com.mbeddr.core/tests/aLibrary/models/aLibrary.lib.mps
index 05a8327d986..dd10287a15f 100644
--- a/code/languages/com.mbeddr.core/tests/aLibrary/models/aLibrary.lib.mps
+++ b/code/languages/com.mbeddr.core/tests/aLibrary/models/aLibrary.lib.mps
@@ -45,7 +45,7 @@
         <property id="5952395988556102274" name="supportsSharedLibraries" index="uKT8v" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -67,7 +67,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -88,7 +88,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -96,7 +96,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -106,7 +106,7 @@
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -127,7 +127,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -139,7 +139,7 @@
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.behavior.mps b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.behavior.mps
index 11a3cdc78bc..6ab1aa727fd 100644
--- a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.behavior.mps
+++ b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.behavior.mps
@@ -61,12 +61,13 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -96,7 +97,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -105,7 +106,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -134,15 +134,15 @@
                     <node concept="3clFbF" id="6v0bPePA0ZU" role="3cqZAp">
                       <node concept="2OqwBi" id="6v0bPePA1cS" role="3clFbG">
                         <node concept="37vLTw" id="6v0bPePA0ZT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6v0bPePA0SC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1VX" resolve="it" />
                         </node>
                         <node concept="1$rogu" id="6v0bPePA1NS" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6v0bPePA0SC" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1VX" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6v0bPePA0SD" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1VY" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -175,15 +175,15 @@
                     <node concept="3clFbF" id="6v0bPePAmMy" role="3cqZAp">
                       <node concept="2OqwBi" id="6v0bPePAmZw" role="3clFbG">
                         <node concept="37vLTw" id="6v0bPePAmMx" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6v0bPePAmFg" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN1VZ" resolve="it" />
                         </node>
                         <node concept="1$rogu" id="6v0bPePAnsX" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6v0bPePAmFg" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1VZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6v0bPePAmFh" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1W0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.editor.mps b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.editor.mps
index c161162a6cb..5f867a5335f 100644
--- a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.editor.mps
+++ b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.editor.mps
@@ -40,7 +40,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.structure.mps b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.structure.mps
index 9493c5aa7d3..472cac8794d 100644
--- a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.structure.mps
+++ b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/models/test.assessments.testlang.structure.mps
@@ -33,7 +33,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 14ccba91d87..f5024c465e8 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
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.core/tests/test.assessments/models/test.assessments@tests.mps b/code/languages/com.mbeddr.core/tests/test.assessments/models/test.assessments@tests.mps
index db287184a5e..fabd94dc05c 100644
--- a/code/languages/com.mbeddr.core/tests/test.assessments/models/test.assessments@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.assessments/models/test.assessments@tests.mps
@@ -72,7 +72,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -84,6 +84,7 @@
       <concept id="2557074442922438156" name="de.slisson.mps.richtext.structure.Word" flags="ng" index="19SUe$" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -160,7 +161,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -182,7 +183,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -473,7 +473,7 @@
                     <node concept="3clFbF" id="5Z2CJwRnZGz" role="3cqZAp">
                       <node concept="2OqwBi" id="5Z2CJwRnZQg" role="3clFbG">
                         <node concept="37vLTw" id="5Z2CJwRnZGy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5Z2CJwRnZ_n" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2A0" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="5Z2CJwRo0s6" role="2OqNvi">
                           <ref role="3TsBF5" to="hikj:6v0bPeP_OG_" resolve="id" />
@@ -481,9 +481,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5Z2CJwRnZ_n" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2A0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5Z2CJwRnZ_o" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2A1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
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 c12600862bc..a17e8bd48fc 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.assessments" uuid="c540669f-7495-4f0f-b5fc-81eb94934084" moduleVersion="0" compileInMPS="true">
+<solution name="test.assessments" uuid="c540669f-7495-4f0f-b5fc-81eb94934084" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">2ae9b0c0-0e87-4510-aa2a-9949fa0436bf(test.assessments.testlang)</dependency>
@@ -26,7 +25,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps
index 3bd84644c85..ff945fde489 100644
--- a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps
@@ -9,7 +9,7 @@
     <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="5" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="5" />
     <use id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt" version="5" />
@@ -139,7 +139,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -155,7 +155,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -178,10 +178,10 @@
         <child id="3134547887598498471" name="body" index="gg_gl" />
         <child id="3134547887598498479" name="condition" index="gg_gt" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
-      <concept id="5806551411806985509" name="com.mbeddr.core.statements.structure.ICanBeStoredInRegister" flags="ng" index="3emlUr">
+      <concept id="5806551411806985509" name="com.mbeddr.core.statements.structure.ICanBeStoredInRegister" flags="ngI" index="3emlUr">
         <property id="5806551411806985511" name="storeInRegister" index="3emlUp" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -258,7 +258,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -270,14 +270,14 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
         <child id="4185783222026475860" name="body" index="3XIRFX" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="6610873504380357354" name="com.mbeddr.core.modules.structure.GlobalVarRef" flags="ng" index="1S7827">
@@ -302,7 +302,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="779128492853369165" name="jetbrains.mps.lang.core.structure.SideTransformInfo" flags="ng" index="1KehLL">
@@ -336,7 +336,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/dataflow@tests.mps b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/dataflow@tests.mps
index b139f553aea..6f35672208f 100644
--- a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/dataflow@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/dataflow@tests.mps
@@ -26,14 +26,14 @@
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -44,7 +44,7 @@
       <concept id="6610873504380335822" name="com.mbeddr.core.modules.structure.GlobalVariableDeclaration" flags="ng" index="1S7NMz" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -57,7 +57,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/parenthesis@tests.mps b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/parenthesis@tests.mps
index c1b18490a7d..9f88c101231 100644
--- a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/parenthesis@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/parenthesis@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="b4f35ed8-45af-4efa-abe4-00ac26956e69" name="com.mbeddr.mpsutil.grammarcells.runtimelang" version="-1" />
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -95,7 +95,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,7 +113,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -163,7 +163,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -171,14 +171,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -198,7 +198,7 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="1216130694486" name="jetbrains.mps.baseLanguage.unitTest.structure.ITestCase" flags="ng" index="B2rLd">
+      <concept id="1216130694486" name="jetbrains.mps.baseLanguage.unitTest.structure.ITestCase" flags="ngI" index="B2rLd">
         <property id="6427619394892729757" name="canNotRunInProcess" index="26Nn1l" />
       </concept>
     </language>
@@ -207,7 +207,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -227,7 +227,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd b/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd
index fe627668fb6..04e85d65a11 100644
--- a/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd
+++ b/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.editor.core" uuid="696c96f6-5b95-4072-8731-0a7c9fd47d40" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.editor.core" uuid="696c96f6-5b95-4072-8731-0a7c9fd47d40" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates(com.mbeddr.core.__spreferences.PlatformTemplates)</dependency>
     <dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
@@ -48,12 +47,12 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:5dc5fc0d-37ef-4782-8192-8b5ce1f69f80:jetbrains.mps.baseLanguage.extensionMethods" version="0" />
     <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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd b/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd
index 751d1831670..c1ea5aab0f9 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.core" uuid="0f5cacaf-ece9-4a2a-8680-26d09a4e0b41" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.core" uuid="0f5cacaf-ece9-4a2a-8680-26d09a4e0b41" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="." />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates(com.mbeddr.core.__spreferences.PlatformTemplates)</dependency>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
@@ -47,7 +46,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/reexports.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/reexports.mps
index 33e2dc4f242..46bfe3e3d4c 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/reexports.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/reexports.mps
@@ -45,7 +45,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -67,7 +67,7 @@
       <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -79,7 +79,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -87,7 +87,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -112,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -121,7 +121,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test.ex.core.emptySourceAndHeaderFiles.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test.ex.core.emptySourceAndHeaderFiles.mps
index 64ef7839b5b..9e3b0147e57 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test.ex.core.emptySourceAndHeaderFiles.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test.ex.core.emptySourceAndHeaderFiles.mps
@@ -17,7 +17,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
@@ -57,7 +57,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -88,7 +88,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -96,7 +96,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -119,7 +119,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -130,7 +130,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/blocksAndScopes.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/blocksAndScopes.mps
index ff10f4047bf..8806763bc9f 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/blocksAndScopes.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/blocksAndScopes.mps
@@ -10,7 +10,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -77,7 +77,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -92,7 +92,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -100,7 +100,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -120,7 +120,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -136,7 +136,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/c90.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/c90.mps
index cd45f0893e3..28188d76976 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/c90.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/c90.mps
@@ -12,7 +12,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -73,7 +73,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -123,7 +123,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -131,14 +131,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -181,7 +181,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -202,7 +202,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/commenting.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/commenting.mps
index 03682aca49a..e3db35797b2 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/commenting.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/commenting.mps
@@ -10,7 +10,7 @@
   </imports>
   <registry>
     <language id="92f195b6-a209-4804-ad65-f5248ecd5873" name="com.mbeddr.mpsutil.margincell">
-      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ng" index="3vooZZ">
+      <concept id="1159656764131926609" name="com.mbeddr.mpsutil.margincell.structure.IMarginCellContent" flags="ngI" index="3vooZZ">
         <property id="8039098920897639409" name="attachedCellId" index="19LeSh" />
         <reference id="8039098920897680033" name="attachedNode" index="19LoX1" />
       </concept>
@@ -31,7 +31,7 @@
         <child id="3134547887598498471" name="body" index="gg_gl" />
         <child id="3134547887598498479" name="condition" index="gg_gt" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -95,7 +95,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -110,7 +110,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -149,7 +149,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -172,7 +172,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/dummy@tests.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/dummy@tests.mps
index 4f73d9c227b..040b8d6dd34 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/dummy@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/dummy@tests.mps
@@ -18,7 +18,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/embedded.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/embedded.mps
index 881200987f4..9ac23b152dd 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/embedded.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/embedded.mps
@@ -42,7 +42,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -55,7 +55,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -123,7 +123,7 @@
       <concept id="6847490852670653132" name="com.mbeddr.core.embedded.structure.EmulatedRegisterKind" flags="ng" index="3VbeTE" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -137,7 +137,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/errorhandling.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/errorhandling.mps
index 2b1205cf1ba..96bfcd7e574 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/errorhandling.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/errorhandling.mps
@@ -76,7 +76,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -84,14 +84,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -132,7 +132,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -141,7 +141,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalModules.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalModules.mps
index c407c8d96eb..a11bf7b0652 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalModules.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalModules.mps
@@ -74,7 +74,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -102,10 +102,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -113,7 +113,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -152,7 +152,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -163,7 +163,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalOFile.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalOFile.mps
index e74b62a0507..6c1b8007eaa 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalOFile.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/externalOFile.mps
@@ -50,7 +50,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -66,7 +66,7 @@
       <concept id="6116558314501417934" name="com.mbeddr.core.modules.structure.ExternalResourceDescriptor" flags="ng" index="rcWEJ">
         <property id="6116558314501417936" name="path" index="rcWEL" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -74,7 +74,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -107,7 +107,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -118,7 +118,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/globals.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/globals.mps
index f35e9bca8c0..e45e2e91abb 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/globals.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/globals.mps
@@ -43,7 +43,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -54,7 +54,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -75,7 +75,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -115,7 +115,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -125,7 +125,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gototests.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gototests.mps
index 592c0eff604..e0251c98b94 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gototests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gototests.mps
@@ -44,7 +44,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -53,7 +53,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -80,7 +80,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -89,7 +89,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gswitchBlockExpr.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gswitchBlockExpr.mps
index f103ea7e7c7..6aa1b7753f2 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gswitchBlockExpr.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/gswitchBlockExpr.mps
@@ -10,7 +10,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -61,7 +61,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -108,7 +108,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -136,14 +136,14 @@
         <reference id="6021475212426147388" name="constant" index="BUAnL" />
         <child id="6021475212426185244" name="arguments" index="BULBh" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -187,7 +187,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -203,7 +203,7 @@
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/importAndReexport.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/importAndReexport.mps
index 8e449a27a7b..62e1349f318 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/importAndReexport.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/importAndReexport.mps
@@ -38,7 +38,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -59,7 +59,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -87,7 +87,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -96,7 +96,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/inline.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/inline.mps
index d93fcff59c5..ba6e616abe0 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/inline.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/inline.mps
@@ -10,7 +10,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -61,7 +61,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -72,14 +72,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -104,7 +104,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -116,7 +116,7 @@
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps
index 236f3c127ee..9424ef715a2 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps
@@ -26,7 +26,7 @@
         <child id="3108382027639948852" name="dummyType" index="s$Nr8" />
         <child id="3108382027639948855" name="arguments" index="s$Nrb" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -128,7 +128,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -140,7 +140,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="1052812498347460298" name="com.mbeddr.core.modules.structure.VaStartStatement" flags="ng" index="2HyX6D">
@@ -155,7 +155,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -167,7 +167,7 @@
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -195,7 +195,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -229,7 +229,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/nameShortening.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/nameShortening.mps
index acb47d15c45..6fc1f4eba87 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/nameShortening.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/nameShortening.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
@@ -40,7 +40,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -62,7 +62,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -70,14 +70,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -87,7 +87,7 @@
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -96,7 +96,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/newInitExpr.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/newInitExpr.mps
index 3d8af31da24..84cf88d9d1d 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/newInitExpr.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/newInitExpr.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -71,14 +71,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -91,7 +91,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -102,7 +102,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/opaque.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/opaque.mps
index 7a386a82869..146653a2357 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/opaque.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/opaque.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf" />
@@ -51,7 +51,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -60,7 +60,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -79,12 +79,12 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/pointers.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/pointers.mps
index cb8c61e8af5..895f038d646 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/pointers.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/pointers.mps
@@ -20,7 +20,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -170,7 +170,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -224,10 +224,10 @@
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -235,7 +235,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -302,7 +302,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -331,7 +331,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/queue.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/queue.mps
index 3731ae21042..74b1624504d 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/queue.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/queue.mps
@@ -58,7 +58,7 @@
       <concept id="6469640632363553001" name="com.mbeddr.core.util.structure.QueueIsEmpty" flags="ng" index="3XJ_s9" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -67,7 +67,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -115,7 +115,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ranges.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ranges.mps
index 321ba686b5a..e9e2f860a67 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ranges.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ranges.mps
@@ -97,7 +97,7 @@
       <concept id="3539348727140765989" name="com.mbeddr.core.udt.structure.SignedBitType" flags="ng" index="1KqDJf" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -106,7 +106,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -139,7 +139,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -156,7 +156,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/reporting.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/reporting.mps
index 7e38cc298e4..6cb68bf0794 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/reporting.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/reporting.mps
@@ -70,7 +70,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -82,7 +82,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -118,7 +118,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -126,7 +126,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ringbuffer.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ringbuffer.mps
index 1e8826eda2c..3d289c97c78 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ringbuffer.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/ringbuffer.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -71,7 +71,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -80,7 +80,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -104,7 +104,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -119,7 +119,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sections.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sections.mps
index 113242e016c..26c5681b9ab 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sections.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sections.mps
@@ -41,7 +41,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -52,14 +52,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -96,7 +96,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -106,7 +106,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sorting.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sorting.mps
index 3f9e8de8195..0a05a329614 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sorting.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/sorting.mps
@@ -10,7 +10,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -102,7 +102,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -117,17 +117,17 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -171,7 +171,7 @@
       <concept id="6847490852670653132" name="com.mbeddr.core.embedded.structure.EmulatedRegisterKind" flags="ng" index="3VbeTE" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -191,7 +191,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/stack.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/stack.mps
index 32d5244ace9..5d8ee5a3142 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/stack.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/stack.mps
@@ -66,7 +66,7 @@
       <concept id="291293396414259471" name="com.mbeddr.core.util.structure.StackIsFull" flags="ng" index="3YIC33" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -75,7 +75,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -118,7 +118,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/statements.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/statements.mps
index 0468e528620..634495dbb5f 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/statements.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/statements.mps
@@ -127,7 +127,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -146,7 +146,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -154,7 +154,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -205,7 +205,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -221,7 +221,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/staticCast.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/staticCast.mps
index a40c84588cb..d2ee73483ac 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/staticCast.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/staticCast.mps
@@ -48,7 +48,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -64,7 +64,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -86,7 +86,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -107,7 +107,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strangenumbers.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strangenumbers.mps
index 3010dc692d2..812bb6ed6c2 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strangenumbers.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strangenumbers.mps
@@ -44,7 +44,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -53,7 +53,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
     </language>
@@ -74,7 +74,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -85,7 +85,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strings.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strings.mps
index 842151d1ce6..d6fb733fc43 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strings.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/strings.mps
@@ -7,7 +7,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -47,7 +47,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -70,7 +70,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -79,7 +79,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -114,7 +114,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structhashprinting.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structhashprinting.mps
index 663d0d0d1c6..fb86e9d06a6 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structhashprinting.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structhashprinting.mps
@@ -18,7 +18,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -92,19 +92,19 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -153,7 +153,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structinit.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structinit.mps
index 40c0a0243b8..3f0f4930ce8 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structinit.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structinit.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -77,7 +77,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -86,7 +86,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -110,7 +110,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -125,7 +125,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structprinting.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structprinting.mps
index 5beb4614dd0..87b1eb3f07b 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structprinting.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structprinting.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -77,7 +77,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -85,17 +85,17 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -114,7 +114,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -127,7 +127,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
index f456925f104..b9b77717138 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -124,7 +124,7 @@
       <concept id="3539348727140765989" name="com.mbeddr.core.udt.structure.SignedBitType" flags="ng" index="1KqDJf" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -147,7 +147,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -155,7 +155,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -195,7 +195,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -216,7 +216,7 @@
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structuredAsserts.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structuredAsserts.mps
index 42b2737783b..034b8773eaf 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structuredAsserts.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structuredAsserts.mps
@@ -45,7 +45,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -54,7 +54,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -83,7 +83,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -93,7 +93,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/testHelpers.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/testHelpers.mps
index 7eab35c409b..a7f15fb3e8b 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/testHelpers.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/testHelpers.mps
@@ -10,7 +10,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -60,7 +60,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -107,7 +107,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -123,7 +123,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/typedefsAndTypes.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/typedefsAndTypes.mps
index f86e0f644e1..158b03762ce 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/typedefsAndTypes.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/typedefsAndTypes.mps
@@ -77,7 +77,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -100,7 +100,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -108,7 +108,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -134,7 +134,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -156,7 +156,7 @@
       </concept>
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
index f5454e658cb..7d49b2a541d 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -87,7 +87,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -99,7 +99,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -126,7 +126,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -142,7 +142,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/uniqueIncludeGuard.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/uniqueIncludeGuard.mps
index dbbac2a8d46..73375f6c7b7 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/uniqueIncludeGuard.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/uniqueIncludeGuard.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
@@ -56,7 +56,7 @@
       <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -67,7 +67,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -75,7 +75,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -85,7 +85,7 @@
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -95,7 +95,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/utils.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/utils.mps
index a4e0a6b491a..adf5a745304 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/utils.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/utils.mps
@@ -14,7 +14,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -173,7 +173,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -188,7 +188,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -196,7 +196,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -244,7 +244,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -266,7 +266,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/virtualpackage.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/virtualpackage.mps
index 22b9b6b0663..1ad89263c48 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/virtualpackage.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/virtualpackage.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
@@ -45,7 +45,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -57,7 +57,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -65,7 +65,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -80,7 +80,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -90,7 +90,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd
index ee82ba9771e..8ec15719c29 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd
+++ b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.errorreporting" uuid="c07b5f13-ad5f-4d20-8135-e779258a1721" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.errorreporting" uuid="c07b5f13-ad5f-4d20-8135-e779258a1721" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -12,7 +12,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates(com.mbeddr.core.__spreferences.PlatformTemplates)</dependency>
   </dependencies>
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/models/main.mps b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/models/main.mps
index 0d44b8cfc5c..25e29dd0106 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/models/main.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/models/main.mps
@@ -13,7 +13,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -85,7 +85,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -97,7 +97,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -105,7 +105,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -134,7 +134,7 @@
       <concept id="8610007178384196427" name="com.mbeddr.core.unittest.structure.UnitTestConfigItem" flags="ng" index="12mU2y" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -146,7 +146,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/test/ex/errorreporting/dummy@tests.mps b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/test/ex/errorreporting/dummy@tests.mps
index 47cf44664d2..f970c72c054 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/test/ex/errorreporting/dummy@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/test/ex/errorreporting/dummy@tests.mps
@@ -18,7 +18,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps
index 0b8727f5acd..6ba807254ca 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps
@@ -28,7 +28,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400486526326" name="jetbrains.mps.lang.test.structure.WarningStatementReference" flags="ng" index="2PQEqo" />
@@ -85,14 +85,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -108,7 +108,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -119,7 +119,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="9013371069686136255" name="com.mbeddr.core.expressions.structure.BitwiseLeftShiftExpression" flags="ng" index="3oul24" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps
index 65777915766..bc86d5083bb 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps
@@ -53,7 +53,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd
index 9f2ac611250..2ed61cf023e 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.core.checks" uuid="2b7c5da7-0903-4c3a-8e3b-e7de05634795" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.core.checks" uuid="2b7c5da7-0903-4c3a-8e3b-e7de05634795" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
     <dependency reexport="false">b2da2e1a-b542-47f5-9be0-4dc21efe74a4(com.mbeddr.core.checks)</dependency>
@@ -34,7 +33,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd
index 68253f20b4f..3b073e7f21f 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.core.dataflow" uuid="6c8cf18f-5d31-40f7-9860-e8ebedaa290d" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.core.dataflow" uuid="6c8cf18f-5d31-40f7-9860-e8ebedaa290d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -100,7 +99,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="6c8cf18f-5d31-40f7-9860-e8ebedaa290d(test.ts.core.dataflow)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/cs.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/cs.mps
index 846b1f42eab..cb719088769 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/cs.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/cs.mps
@@ -22,7 +22,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -102,7 +102,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -110,7 +110,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -154,7 +154,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/sensor.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/sensor.mps
index 7d049080b0c..0fc41dbdf82 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/sensor.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/sensor.mps
@@ -19,7 +19,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -68,7 +68,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -76,7 +76,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -93,7 +93,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -108,7 +108,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/tests@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/tests@tests.mps
index 4452df1dc5b..7111eb42a27 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/tests@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/models/test/ts/core/dataflow/tests@tests.mps
@@ -26,7 +26,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -65,7 +65,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -152,7 +152,7 @@
       <concept id="2315230369548617609" name="com.mbeddr.core.modules.structure.ArgumentKindAnnotation" flags="ng" index="61hT8">
         <property id="2315230369548626622" name="value" index="61jdZ" />
       </concept>
-      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ng" index="k8FjF">
+      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ngI" index="k8FjF">
         <child id="883533952987441014" name="kind" index="3U$Ho4" />
       </concept>
       <concept id="8551646674110484035" name="com.mbeddr.core.modules.structure.FunctionRefExpr" flags="ng" index="pF0ck">
@@ -181,17 +181,17 @@
         <reference id="6021475212426147388" name="constant" index="BUAnL" />
         <child id="6021475212426185244" name="arguments" index="BULBh" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -222,7 +222,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -248,7 +248,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/embedded@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/embedded@tests.mps
index 028dd6e88e7..de26fb84bc3 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/embedded@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/embedded@tests.mps
@@ -22,7 +22,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -78,7 +78,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -119,7 +119,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -136,7 +136,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/util@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/util@tests.mps
index d188d739f3c..fcbbbd51b1e 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/util@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/models/test/ts/core/extended/util@tests.mps
@@ -30,7 +30,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -71,7 +71,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -203,7 +203,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -219,17 +219,17 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -264,7 +264,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -297,7 +297,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd
index 3cc90dc486f..a4807476f8d 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.core.extended" uuid="1dddf916-f9bd-4c3b-af45-3f86032dab45" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.core.extended" uuid="1dddf916-f9bd-4c3b-af45-3f86032dab45" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates(com.mbeddr.core.__spreferences.PlatformTemplates)</dependency>
     <dependency reexport="false">783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)</dependency>
@@ -46,7 +45,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -103,7 +102,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="1dddf916-f9bd-4c3b-af45-3f86032dab45(test.ts.core.extended)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/helper.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/helper.mps
index b4c0fc7426d..ed103910cd4 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/helper.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/helper.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -104,7 +104,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -117,7 +117,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -146,7 +146,7 @@
       <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps
index 1dd8ad56520..dd4bf9929e3 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps
@@ -9,7 +9,7 @@
     <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="10" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="2" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="390de4af-0c8d-4716-8dec-3d05ca751b28" name="com.mbeddr.core.cinterpreter" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -113,7 +113,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -146,6 +146,7 @@
       <concept id="440773076688628186" name="com.mbeddr.core.buildconfig.structure.NothingPlatform" flags="ng" index="wyh$t" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
       </concept>
@@ -156,7 +157,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -166,14 +167,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -208,7 +209,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -237,7 +238,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
@@ -269,7 +270,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
     </language>
@@ -344,7 +344,7 @@
                             <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
                             <ref role="37wK5l" to="2ahs:4jkUBhBVOKX" resolve="getInterpreterExecutable" />
                             <node concept="37vLTw" id="3YR_2qPI1vU" role="37wK5m">
-                              <ref role="3cqZAo" node="3YR_2qPI1vW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2A2" resolve="it" />
                             </node>
                           </node>
                           <node concept="3uibUv" id="3YR_2qPI1vV" role="10QFUM">
@@ -354,9 +354,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3YR_2qPI1vW" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2A2" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3YR_2qPI1vX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2A3" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd
index f6d01937db7..73aa0242b80 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.core.performance" uuid="15647c29-db71-4cfd-8aee-149f84bd12f4" moduleVersion="0" pluginKind="PLUGIN_CORE" compileInMPS="true">
+<solution name="test.ts.core.performance" uuid="15647c29-db71-4cfd-8aee-149f84bd12f4" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">390de4af-0c8d-4716-8dec-3d05ca751b28(com.mbeddr.core.cinterpreter)</dependency>
@@ -41,7 +40,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -104,7 +103,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="15647c29-db71-4cfd-8aee-149f84bd12f4(test.ts.core.performance)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd b/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd
index 906f115f84e..26077a7f549 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.core" uuid="6c345d5a-820d-4b6d-9bea-8a6794de05b7" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.core" uuid="6c345d5a-820d-4b6d-9bea-8a6794de05b7" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -13,7 +13,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates(com.mbeddr.core.__spreferences.PlatformTemplates)</dependency>
@@ -60,7 +59,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -127,7 +126,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="6c345d5a-820d-4b6d-9bea-8a6794de05b7(test.ts.core)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.importexport@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.importexport@tests.mps
index 6a56e6d55f7..73a63afab56 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.importexport@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.importexport@tests.mps
@@ -20,7 +20,7 @@
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -91,7 +91,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -99,7 +99,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -127,7 +127,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.reexport@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.reexport@tests.mps
index acf84bc08a7..e9caa7ae829 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.reexport@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests.ts.core.reexport@tests.mps
@@ -33,7 +33,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf">
@@ -78,7 +78,7 @@
       <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -96,10 +96,10 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -107,7 +107,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -123,7 +123,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -132,7 +132,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/checks@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/checks@tests.mps
index 32ca73c8b4e..4931502f65e 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/checks@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/checks@tests.mps
@@ -26,7 +26,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400486526326" name="jetbrains.mps.lang.test.structure.WarningStatementReference" flags="ng" index="2PQEqo" />
@@ -73,7 +73,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -87,14 +87,14 @@
         <child id="8551646674110395548" name="returnType" index="pFrBb" />
       </concept>
       <concept id="7350547698093816046" name="com.mbeddr.core.modules.structure.PureFunctionAnnotation" flags="ng" index="2Bs1N1" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -129,7 +129,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/errorHandling@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/errorHandling@tests.mps
index fc920b45de8..b4ef0ceea0c 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/errorHandling@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/errorHandling@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
     <use id="5e845763-f4ca-40bf-b31f-74e236ffed75" name="com.mbeddr.mpsutil.spreferences.context" version="0" />
@@ -37,7 +37,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -98,7 +98,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -106,14 +106,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -130,7 +130,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -140,7 +140,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/scope@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/scope@tests.mps
index f158b053b5a..77cdb4bab19 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/scope@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/scope@tests.mps
@@ -26,7 +26,7 @@
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -109,7 +109,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -122,7 +122,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -150,7 +150,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/staticEvaluator@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/staticEvaluator@tests.mps
index ad85d3d3c06..e7e9d0ead2a 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/staticEvaluator@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests/ts/core/staticEvaluator@tests.mps
@@ -58,7 +58,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -93,7 +93,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -115,7 +115,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -123,7 +123,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
index 862775155d3..bc127d76255 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
     <use id="5e845763-f4ca-40bf-b31f-74e236ffed75" name="com.mbeddr.mpsutil.spreferences.context" version="0" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/cinterpreter@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/cinterpreter@tests.mps
index 62035d9b30e..e885a41643b 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/cinterpreter@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/cinterpreter@tests.mps
@@ -27,7 +27,7 @@
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -89,7 +89,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -97,14 +97,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -159,7 +159,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/interpreter@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/interpreter@tests.mps
index 2b942b86a82..fa136b13eec 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/interpreter@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/interpreter@tests.mps
@@ -5,7 +5,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -46,7 +46,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400486526326" name="jetbrains.mps.lang.test.structure.WarningStatementReference" flags="ng" index="2PQEqo" />
@@ -158,7 +158,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -288,6 +288,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -303,7 +304,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -312,7 +313,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -386,7 +387,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -416,7 +417,7 @@
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -454,7 +455,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
       <concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
         <child id="1197687026896" name="keyType" index="3rHrn6" />
@@ -2620,7 +2620,7 @@
                     <node concept="3clFbF" id="7F2vPZ3A8Nf" role="3cqZAp">
                       <node concept="2OqwBi" id="7F2vPZ3A8Ng" role="3clFbG">
                         <node concept="37vLTw" id="7F2vPZ3A8Nh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7F2vPZ3A8Nj" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2A4" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7F2vPZ3A8Ni" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2628,9 +2628,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7F2vPZ3A8Nj" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2A4" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7F2vPZ3A8Nk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2A5" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2653,7 +2653,7 @@
                     <node concept="3clFbF" id="7F2vPZ3AaoN" role="3cqZAp">
                       <node concept="2OqwBi" id="7F2vPZ3AaoO" role="3clFbG">
                         <node concept="37vLTw" id="7F2vPZ3AaoP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7F2vPZ3AaoR" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2A6" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7F2vPZ3AaoQ" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2661,9 +2661,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7F2vPZ3AaoR" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2A6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7F2vPZ3AaoS" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2A7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2694,7 +2694,7 @@
                     <node concept="3clFbF" id="7F2vPZ3A7dJ" role="3cqZAp">
                       <node concept="2OqwBi" id="7F2vPZ3A7dK" role="3clFbG">
                         <node concept="37vLTw" id="7F2vPZ3A7dL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7F2vPZ3A7dN" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2A8" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7F2vPZ3A7dM" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2702,9 +2702,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7F2vPZ3A7dN" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2A8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7F2vPZ3A7dO" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2A9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2727,7 +2727,7 @@
                     <node concept="3clFbF" id="7F2vPZ3A5Hr" role="3cqZAp">
                       <node concept="2OqwBi" id="7F2vPZ3A5Hs" role="3clFbG">
                         <node concept="37vLTw" id="7F2vPZ3A5Ht" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7F2vPZ3A5Hv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Aa" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7F2vPZ3A5Hu" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2735,9 +2735,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7F2vPZ3A5Hv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Aa" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7F2vPZ3A5Hw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Ab" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4280,16 +4280,16 @@
                               <node concept="TvHiN" id="7F2vPZ4FN1s" role="2Oq$k0" />
                               <node concept="2Nt0df" id="7F2vPZ4FN1t" role="2OqNvi">
                                 <node concept="37vLTw" id="7F2vPZ4FN1u" role="38cxEo">
-                                  <ref role="3cqZAo" node="7F2vPZ4FN1v" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Ac" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7F2vPZ4FN1v" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ac" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7F2vPZ4FN1w" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Ad" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6717,15 +6717,15 @@
           </node>
           <node concept="2HxqBE" id="7oujAIfLLLl" role="2OqNvi">
             <node concept="1bVj0M" id="7oujAIfLLLm" role="23t8la">
-              <node concept="Rh6nW" id="7oujAIfLLLn" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2Ae" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="7oujAIfLLLo" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2Af" role="1tU5fm" />
               </node>
               <node concept="3clFbS" id="7oujAIfLLLp" role="1bW5cS">
                 <node concept="3clFbF" id="7oujAIfLLLq" role="3cqZAp">
                   <node concept="3SLO07" id="7oujAIfLLLr" role="3clFbG">
                     <node concept="37vLTw" id="7oujAIfLLLs" role="3SLO0q">
-                      <ref role="3cqZAo" node="7oujAIfLLLn" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN2Ae" resolve="it" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml b/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml
index 651bd32ab33..f2bdcb6c621 100644
--- a/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml
+++ b/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml
@@ -20,12 +20,14 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.name2id_gen_perroot" value="executed" />
     <entry key="jetbrains.mps.obsoletePropsCleanup" value="executed" />
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
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 1e949999d09..f74f5c45299 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
@@ -73,7 +73,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
@@ -92,7 +91,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/generator/template/main@generator.mps
index 3e99ce19db8..bcd7575d373 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/generator/template/main@generator.mps
@@ -10,7 +10,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/behavior.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/behavior.mps
index 6bf1909d2a9..8973101f3b0 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/behavior.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/behavior.mps
@@ -34,7 +34,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -71,13 +71,13 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -116,7 +116,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/documentation.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/documentation.mps
index d95bfbc6e2d..f01c600a659 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/documentation.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/documentation.mps
@@ -30,7 +30,7 @@
       </concept>
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136472795" name="com.mbeddr.doc.structure.PathDefinition" flags="ng" index="2SbYGw">
@@ -43,7 +43,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -76,7 +76,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/structure.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/structure.mps
index acc92a61bf1..69bb120fcb7 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/structure.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/models/structure.mps
@@ -23,7 +23,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl
index 86dffeca884..0c01c8d4b95 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="true">38a074ed-e5ad-4b2d-be31-ca436911b8aa(com.mbeddr.doc.aspect)</dependency>
@@ -29,7 +28,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -49,7 +48,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com.mbeddr.doc.aspect.exampleLanguage.plugin.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com.mbeddr.doc.aspect.exampleLanguage.plugin.mps
index 2d2f045ba84..32ed829121a 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com.mbeddr.doc.aspect.exampleLanguage.plugin.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com.mbeddr.doc.aspect.exampleLanguage.plugin.mps
@@ -26,7 +26,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
@@ -41,7 +41,7 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -66,7 +66,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -76,7 +76,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps
index dd981c1a397..9e12d57543a 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps
@@ -34,10 +34,10 @@
       </concept>
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="3861573051973810887" name="com.mbeddr.doc.structure.ITextOverride" flags="ng" index="0yqFW">
+      <concept id="3861573051973810887" name="com.mbeddr.doc.structure.ITextOverride" flags="ngI" index="0yqFW">
         <property id="3861573051973810888" name="textOverride" index="0yqFN" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -61,7 +61,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -96,7 +96,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps
index 5190a287d06..567cd9ce50b 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps
@@ -49,7 +49,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
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 eac3fe4d8cc..5c37bc4a166 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.aspect.exampleLanguage.sandbox" uuid="3e0fa136-ab87-4d87-8315-5997ec0beebe" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.aspect.exampleLanguage.sandbox" uuid="3e0fa136-ab87-4d87-8315-5997ec0beebe" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:3c21902d-b582-4557-b697-84a4dcddff3a:com.mbeddr.doc.aspect.exampleLanguage" version="0" />
@@ -22,7 +21,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps
index 37e2705614d..2dc8a3fc74a 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl
index 068d734ee63..545f7949450 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl
@@ -36,7 +36,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -95,7 +95,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -113,7 +112,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -136,7 +135,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/generator/template/main@generator.mps
index 1bb7403ef8b..801f4455b9c 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/generator/template/main@generator.mps
@@ -8,7 +8,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -123,7 +123,7 @@
       </concept>
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -140,7 +140,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -187,7 +187,7 @@
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ngI" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
@@ -203,6 +203,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -257,7 +258,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -307,7 +308,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
@@ -796,7 +796,7 @@
                             <property role="3cmrfH" value="1" />
                           </node>
                           <node concept="37vLTw" id="1CsE99tDWV0" role="1LFl5Q">
-                            <ref role="3cqZAo" node="1CsE99tDWV6" resolve="b" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Zt" resolve="b" />
                           </node>
                         </node>
                         <node concept="1LFfDK" id="1CsE99tDWV1" role="3uHU7B">
@@ -804,19 +804,19 @@
                             <property role="3cmrfH" value="1" />
                           </node>
                           <node concept="37vLTw" id="1CsE99tDWV3" role="1LFl5Q">
-                            <ref role="3cqZAo" node="1CsE99tDWV4" resolve="a" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Zr" resolve="a" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1CsE99tDWV4" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Zr" role="1bW2Oz">
                     <property role="TrG5h" value="a" />
-                    <node concept="2jxLKc" id="1CsE99tDWV5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Zs" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="1CsE99tDWV6" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Zt" role="1bW2Oz">
                     <property role="TrG5h" value="b" />
-                    <node concept="2jxLKc" id="1CsE99tDWV7" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1Zu" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="1CsE99tE41n" role="2Dq5b$" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/constraints.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/constraints.mps
index a591231ff79..2205666b29c 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/constraints.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/constraints.mps
@@ -74,7 +74,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -108,6 +108,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -134,7 +135,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -163,7 +164,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -336,7 +336,7 @@
                         <node concept="3clFbF" id="5CkU_dHijwI" role="3cqZAp">
                           <node concept="2OqwBi" id="5CkU_dHijwJ" role="3clFbG">
                             <node concept="37vLTw" id="5CkU_dHijwK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHijwM" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1Zn" resolve="it" />
                             </node>
                             <node concept="liA8E" id="5CkU_dHijwL" role="2OqNvi">
                               <ref role="37wK5l" to="w1kc:~Language.getStructureModelDescriptor()" resolve="getStructureModelDescriptor" />
@@ -344,9 +344,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHijwM" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1Zn" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHijwN" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1Zo" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -359,7 +359,7 @@
                           <node concept="1eOMI4" id="5CkU_dHijwT" role="2Oq$k0">
                             <node concept="10QFUN" id="5CkU_dHijwU" role="1eOMHV">
                               <node concept="37vLTw" id="5CkU_dHijwV" role="10QFUP">
-                                <ref role="3cqZAo" node="5CkU_dHijwY" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1Zp" resolve="it" />
                               </node>
                               <node concept="H_c77" id="5CkU_dHijwW" role="10QFUM" />
                             </node>
@@ -372,9 +372,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHijwY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1Zp" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHijwZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1Zq" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps
index 5dbb7f68668..c8305c9826f 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps
@@ -69,7 +69,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -95,7 +95,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -167,7 +167,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -182,7 +182,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -230,7 +230,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -285,7 +285,6 @@
       <node concept="2iRkQZ" id="UK_oBpA4Fe" role="2iSdaV" />
     </node>
     <node concept="3EZMnI" id="1XKxHZsTPvT" role="6VMZX">
-      <node concept="2EHx9g" id="1XKxHZsTPwz" role="2iSdaV" />
       <node concept="3EZMnI" id="1CsE99t_Me7" role="3EZMnx">
         <node concept="2iRfu4" id="1CsE99t_Me8" role="2iSdaV" />
         <node concept="3F0ifn" id="1CsE99t_Me4" role="3EZMnx">
@@ -307,6 +306,7 @@
           <ref role="1NtTu8" to="748g:1XKxHZsTPvQ" resolve="overrideChildren" />
         </node>
       </node>
+      <node concept="2EHx9g" id="1XKxHZsTPwz" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="agjuZp0xrR">
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/intentions.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/intentions.mps
index 0ccc1afa921..747a7c4a80a 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/intentions.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/intentions.mps
@@ -79,7 +79,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 c3b2be380eb..ab8398ea034 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
@@ -2,7 +2,7 @@
 <model ref="r:e361f9f2-2afa-4fbe-b895-bdd4fbfe44fa(com.mbeddr.doc.aspect.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps
index c5412f06644..70d921dff32 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -60,11 +60,6 @@
       <property role="TrG5h" value="priority" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
-    <node concept="1TJgyi" id="1XKxHZsTPvQ" role="1TKVEl">
-      <property role="IQ2nx" value="2265458908609337334" />
-      <property role="TrG5h" value="overrideChildren" />
-      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-    </node>
     <node concept="1TJgyj" id="UK_oBpA4EG" role="1TKVEi">
       <property role="20kJfa" value="concept" />
       <property role="20lbJX" value="fLJekj4/_1" />
@@ -80,6 +75,11 @@
         <ref role="trN6q" to="2c95:2TZO3Dbv6N7" resolve="Section" />
       </node>
     </node>
+    <node concept="1TJgyi" id="1XKxHZsTPvQ" role="1TKVEl">
+      <property role="IQ2nx" value="2265458908609337334" />
+      <property role="TrG5h" value="overrideChildren" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
   </node>
   <node concept="1TIwiD" id="1o6EjwiSKvw">
     <property role="TrG5h" value="DocumentedPropertyAnnotation" />
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd
index ee45c4b4f42..51ea1aa1033 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.aspect.runtime" uuid="6d31dab5-f8dd-4ba3-9606-ea5ac2e34495" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.aspect.runtime" uuid="6d31dab5-f8dd-4ba3-9606-ea5ac2e34495" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
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 00071bc06f3..2a467a27bb0 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
@@ -209,6 +209,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -2369,7 +2370,7 @@
                       <node concept="3clFbF" id="5UWo2tdFelZ" role="3cqZAp">
                         <node concept="2OqwBi" id="5UWo2tdFem0" role="3clFbG">
                           <node concept="37vLTw" id="5UWo2tdFem1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5UWo2tdFem3" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2As" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5UWo2tdFem2" role="2OqNvi">
                             <ref role="3Tt5mk" to="2c95:2NM$qy7UbY4" resolve="document" />
@@ -2377,9 +2378,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5UWo2tdFem3" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2As" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5UWo2tdFem4" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2At" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2417,7 +2418,7 @@
                   <node concept="3clFbF" id="7VkE0Bpt7CY" role="3cqZAp">
                     <node concept="2OqwBi" id="7VkE0Bpt7Qx" role="3clFbG">
                       <node concept="37vLTw" id="7VkE0Bpt7CX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7VkE0Bpt7yP" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Au" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="7VkE0Bpt8tt" role="2OqNvi">
                         <ref role="37wK5l" to="4gky:5mf_X_LbzMD" resolve="collectTransitivelyIncludedDocuments" />
@@ -2428,9 +2429,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7VkE0Bpt7yP" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Au" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7VkE0Bpt7yQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Av" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2611,7 +2612,7 @@
                       <node concept="3clFbF" id="5UWo2tdFnFl" role="3cqZAp">
                         <node concept="2OqwBi" id="5UWo2tdFnFn" role="3clFbG">
                           <node concept="37vLTw" id="5UWo2tdFnFo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5UWo2tdFnzj" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Aw" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="1CsE99tJ4Sw" role="2OqNvi">
                             <node concept="1xMEDy" id="1CsE99tJ4Sy" role="1xVPHs">
@@ -2623,9 +2624,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5UWo2tdFnzj" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Aw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5UWo2tdFnzk" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Ax" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2726,7 +2727,7 @@
                       <node concept="3clFbF" id="1CsE99tJhw1" role="3cqZAp">
                         <node concept="2OqwBi" id="1CsE99tJhw2" role="3clFbG">
                           <node concept="37vLTw" id="1CsE99tJhw3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1CsE99tJhw7" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ay" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="1CsE99tJhw4" role="2OqNvi">
                             <node concept="1xMEDy" id="1CsE99tJhw5" role="1xVPHs">
@@ -2738,9 +2739,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1CsE99tJhw7" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Ay" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1CsE99tJhw8" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Az" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2827,7 +2828,7 @@
                   <node concept="3clFbF" id="5UWo2tdFoAe" role="3cqZAp">
                     <node concept="2OqwBi" id="5UWo2tdFoAf" role="3clFbG">
                       <node concept="37vLTw" id="5UWo2tdFoAg" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5UWo2tdFoAk" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2A$" resolve="it" />
                       </node>
                       <node concept="2Rf3mk" id="5UWo2tdFoAh" role="2OqNvi">
                         <node concept="1xMEDy" id="5UWo2tdFoAi" role="1xVPHs">
@@ -2839,9 +2840,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5UWo2tdFoAk" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2A$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5UWo2tdFoAl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2A_" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd
index 7ffb96cfc80..937941db7f5 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.aspect.ui" uuid="467a50a8-ae35-442b-b6e7-9a3f96ae8052" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.doc.aspect.ui" uuid="467a50a8-ae35-442b-b6e7-9a3f96ae8052" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -32,13 +31,13 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
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 0998cf4c300..6b86a9e792f 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
@@ -4,7 +4,7 @@
   <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -16,7 +16,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
   </languages>
   <imports>
@@ -84,6 +84,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1207149998849" name="isAlwaysVisible" index="fJN8o" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -450,6 +451,7 @@
     <property role="TrG5h" value="ShowDocumentation" />
     <property role="2uzpH1" value="Show Documentation" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="69s3uhHTaJn" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
diff --git a/code/languages/com.mbeddr.doc/.mps/migration.xml b/code/languages/com.mbeddr.doc/.mps/migration.xml
index 273d8e8a3ee..65112394c89 100644
--- a/code/languages/com.mbeddr.doc/.mps/migration.xml
+++ b/code/languages/com.mbeddr.doc/.mps/migration.xml
@@ -20,6 +20,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -28,6 +30,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/models/com.mbeddr.doc.__spreferences.PlatformTemplates.mps b/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/models/com.mbeddr.doc.__spreferences.PlatformTemplates.mps
index 51367d9d267..87669db6686 100644
--- a/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/models/com.mbeddr.doc.__spreferences.PlatformTemplates.mps
+++ b/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/models/com.mbeddr.doc.__spreferences.PlatformTemplates.mps
@@ -25,12 +25,12 @@
       <concept id="5323740605968447019" name="com.mbeddr.core.buildconfig.structure.Platform" flags="ng" index="2AWWZO">
         <property id="5952395988556102274" name="supportsSharedLibraries" index="uKT8v" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd
index 1d0db34ded1..6d668271b87 100644
--- a/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd
+++ b/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.doc.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.doc.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd
index 082a538d294..57f84bb7117 100644
--- a/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.doc.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.doc.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl
index 656bed495aa..5303f14bd65 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl
@@ -39,7 +39,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -114,7 +114,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -123,7 +122,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/generator/template/com/mbeddr/doc/expressions/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/generator/template/com/mbeddr/doc/expressions/generator/template/main@generator.mps
index d9485e48983..ecc40cedde5 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/generator/template/com/mbeddr/doc/expressions/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/generator/template/com/mbeddr/doc/expressions/generator/template/main@generator.mps
@@ -61,7 +61,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -83,7 +83,7 @@
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
       <concept id="6165313375055755361" name="com.mbeddr.doc.structure.MathFormattedText" flags="ng" index="$DyYS" />
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136472795" name="com.mbeddr.doc.structure.PathDefinition" flags="ng" index="2SbYGw">
@@ -96,7 +96,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596579911728" name="com.mbeddr.doc.structure.Document" flags="ng" index="1_1swa" />
@@ -147,7 +147,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/behavior.mps
index 50b8991ff48..e1ce76226fd 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/behavior.mps
@@ -46,7 +46,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -64,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/constraints.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/constraints.mps
index b0e8bc7687e..6002b2cfc2c 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/constraints.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/editor.mps
index df51f10207a..07d154f2749 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/editor.mps
@@ -56,7 +56,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -75,7 +75,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -98,7 +98,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -109,7 +109,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/structure.mps
index e0b6d008bc5..a099d9eab75 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/structure.mps
@@ -34,7 +34,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/typesystem.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/typesystem.mps
index 2dcc29b4951..2356f76a093 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/languageModels/typesystem.mps
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl
index f0a9b28c844..fdaa00a1a6c 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl
@@ -42,7 +42,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -114,7 +114,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)</dependency>
   </dependencies>
@@ -122,7 +121,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/doc2latex/util.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/doc2latex/util.mps
index 4acd6ae862e..560f5a9f66a 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/doc2latex/util.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/doc2latex/util.mps
@@ -71,7 +71,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -86,7 +86,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -119,7 +119,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/template/main@generator.mps
index 9d467d96372..e2e8d348f0a 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/template/main@generator.mps
@@ -213,6 +213,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -346,7 +347,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -748,7 +748,7 @@
                               <node concept="3clFbF" id="7$DvC4gRUWH" role="3cqZAp">
                                 <node concept="2OqwBi" id="7$DvC4gRUWI" role="3clFbG">
                                   <node concept="37vLTw" id="7$DvC4gRUWJ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7$DvC4gRUWL" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1Zx" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="7$DvC4gRUWK" role="2OqNvi">
                                     <ref role="3TsBF5" to="2c95:72XbSXEIPz" resolve="name" />
@@ -756,9 +756,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7$DvC4gRUWL" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Zx" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7$DvC4gRUWM" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Zy" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -781,7 +781,7 @@
                                 <node concept="3cpWs3" id="72XbSXF70A" role="3clFbG">
                                   <node concept="1eOMI4" id="72XbSXF70D" role="3uHU7w">
                                     <node concept="37vLTw" id="72XbSXF8hj" role="1eOMHV">
-                                      <ref role="3cqZAo" node="72XbSXEO18" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN1Zz" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3cpWs3" id="72XbSXEO6e" role="3uHU7B">
@@ -801,7 +801,7 @@
                                             <node concept="2OqwBi" id="72XbSXF6oW" role="3uHU7B">
                                               <node concept="2WmjW8" id="72XbSXF6p1" role="2OqNvi">
                                                 <node concept="37vLTw" id="72XbSXF6p3" role="25WWJ7">
-                                                  <ref role="3cqZAo" node="72XbSXEO18" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN1Zz" resolve="it" />
                                                 </node>
                                               </node>
                                               <node concept="37vLTw" id="5Hxjapw9v7Q" role="2Oq$k0">
@@ -823,9 +823,9 @@
                               <property role="TrG5h" value="s" />
                               <node concept="17QB3L" id="72XbSXEO1c" role="1tU5fm" />
                             </node>
-                            <node concept="Rh6nW" id="72XbSXEO18" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1Zz" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="72XbSXEO19" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1Z$" role="1tU5fm" />
                             </node>
                           </node>
                           <node concept="Xl_RD" id="72XbSXEO3J" role="1MDeny">
@@ -996,7 +996,7 @@
                       <node concept="2OqwBi" id="5yxqZJwzYWb" role="3clFbG">
                         <node concept="2JrnkZ" id="5yxqZJwzYVP" role="2Oq$k0">
                           <node concept="37vLTw" id="5yxqZJwzYV6" role="2JrQYb">
-                            <ref role="3cqZAo" node="5mf_X_LbzTf" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN1Z_" resolve="it" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5yxqZJwzYWh" role="2OqNvi">
@@ -1014,9 +1014,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5mf_X_LbzTf" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN1Z_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5mf_X_LbzTg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN1ZA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1252,6 +1252,17 @@
         </node>
       </node>
     </node>
+    <node concept="avzCv" id="6jiGbW$MQKe" role="avys_">
+      <node concept="3clFbS" id="6jiGbW$MQKf" role="2VODD2">
+        <node concept="3clFbF" id="6jiGbW$MQPj" role="3cqZAp">
+          <node concept="2YIFZM" id="6jiGbW$MQPk" role="3clFbG">
+            <ref role="37wK5l" to="81x8:6jiGbW$MP8P" resolve="isApplicable" />
+            <ref role="1Pybhc" to="81x8:6jiGbW$MOGN" resolve="GeneratorHelper" />
+            <node concept="1iwH7S" id="6jiGbW$MQPl" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="xCXNldb4bR" role="3acgRq">
       <ref role="30HIoZ" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
       <node concept="gft3U" id="xCXNldb4bS" role="1lVwrX">
@@ -1294,17 +1305,6 @@
         </node>
       </node>
     </node>
-    <node concept="avzCv" id="6jiGbW$MQKe" role="avys_">
-      <node concept="3clFbS" id="6jiGbW$MQKf" role="2VODD2">
-        <node concept="3clFbF" id="6jiGbW$MQPj" role="3cqZAp">
-          <node concept="2YIFZM" id="6jiGbW$MQPk" role="3clFbG">
-            <ref role="37wK5l" to="81x8:6jiGbW$MP8P" resolve="isApplicable" />
-            <ref role="1Pybhc" to="81x8:6jiGbW$MOGN" resolve="GeneratorHelper" />
-            <node concept="1iwH7S" id="6jiGbW$MQPl" role="37wK5m" />
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="bUwia" id="6jiGbW$MQUL">
     <property role="TrG5h" value="paragraphs" />
@@ -3739,7 +3739,7 @@
                           <node concept="2OqwBi" id="3mn43GOD0xx" role="3clFbG">
                             <node concept="2OqwBi" id="3mn43GOCZOO" role="2Oq$k0">
                               <node concept="37vLTw" id="3mn43GOCZLs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3mn43GOCZJi" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1ZB" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="3mn43GOD0bS" role="2OqNvi">
                                 <ref role="3TsBF5" to="g9w8:47ZkZt5WSI9" resolve="prolog" />
@@ -3749,9 +3749,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mn43GOCZJi" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN1ZB" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3mn43GOCZJj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN1ZC" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3771,7 +3771,7 @@
                           </node>
                           <node concept="2OqwBi" id="3mn43GOD2mm" role="37vLTJ">
                             <node concept="37vLTw" id="3mn43GOD2i3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3mn43GOD2gi" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN1ZD" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3mn43GOD2Ar" role="2OqNvi">
                               <ref role="3TsBF5" to="g9w8:47ZkZt5WSI9" resolve="prolog" />
@@ -3780,9 +3780,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3mn43GOD2gi" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN1ZD" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3mn43GOD2gj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN1ZE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/editor.mps
index 4614779e6a2..c37695816bc 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/editor.mps
@@ -38,7 +38,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/structure.mps
index 64bd5f82fb1..d4c1bf7cbf0 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/languageModels/structure.mps
@@ -29,7 +29,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl
index e0c911172e8..734c0a1b5bb 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl
@@ -11,6 +11,7 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/commonmark-0.17.1.jar" />
     </facet>
   </facets>
   <accessoryModels />
@@ -36,7 +37,7 @@
         <language slang="l:22a8c356-ae1a-4079-96b0-d5e7c21ae7c4:com.mbeddr.doc.markdown" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -110,10 +111,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/commonmark-0.17.1.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -126,7 +123,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -137,7 +134,7 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/generator/templates/com.mbeddr.doc.gen_markdown.generator.templates@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/generator/templates/com.mbeddr.doc.gen_markdown.generator.templates@generator.mps
index adc20ac8809..f8cd3dce9c1 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/generator/templates/com.mbeddr.doc.gen_markdown.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/generator/templates/com.mbeddr.doc.gen_markdown.generator.templates@generator.mps
@@ -168,6 +168,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -434,7 +435,7 @@
                                   <node concept="3fqX7Q" id="7YublcAwCwV" role="3clFbG">
                                     <node concept="2OqwBi" id="7YublcAwCwW" role="3fr31v">
                                       <node concept="37vLTw" id="7YublcAwCwX" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7YublcAwCx0" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ZF" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="7YublcAwCwY" role="2OqNvi">
                                         <node concept="chp4Y" id="7YublcAwCwZ" role="cj9EA">
@@ -445,9 +446,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7YublcAwCx0" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1ZF" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7YublcAwCx1" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1ZG" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -458,7 +459,7 @@
                               <node concept="3clFbF" id="7YublcAwCx5" role="3cqZAp">
                                 <node concept="2OqwBi" id="7YublcAwCx6" role="3clFbG">
                                   <node concept="37vLTw" id="7YublcAwCx7" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7YublcAwCxc" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ZH" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="7YublcAwCx8" role="2OqNvi">
                                     <node concept="1xMEDy" id="7YublcAwCx9" role="1xVPHs">
@@ -471,9 +472,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7YublcAwCxc" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1ZH" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7YublcAwCxd" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1ZI" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -608,7 +609,7 @@
                                   <node concept="3fqX7Q" id="xxE$BMzMUd" role="3clFbG">
                                     <node concept="2OqwBi" id="xxE$BMzMUe" role="3fr31v">
                                       <node concept="37vLTw" id="xxE$BMzMUf" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="xxE$BMzMUi" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ZJ" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="xxE$BMzMUg" role="2OqNvi">
                                         <node concept="chp4Y" id="xxE$BMzMUh" role="cj9EA">
@@ -619,9 +620,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="xxE$BMzMUi" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1ZJ" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="xxE$BMzMUj" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1ZK" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -632,7 +633,7 @@
                               <node concept="3clFbF" id="xxE$BMzvlM" role="3cqZAp">
                                 <node concept="2OqwBi" id="xxE$BMzvlN" role="3clFbG">
                                   <node concept="37vLTw" id="xxE$BMzvlO" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="xxE$BMzvlT" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ZL" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="xxE$BMzvlP" role="2OqNvi">
                                     <node concept="1xMEDy" id="xxE$BMzvlQ" role="1xVPHs">
@@ -645,9 +646,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="xxE$BMzvlT" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1ZL" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="xxE$BMzvlU" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1ZM" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -782,7 +783,7 @@
                                   <node concept="3fqX7Q" id="7YublcAwDc_" role="3clFbG">
                                     <node concept="2OqwBi" id="7YublcAwDcA" role="3fr31v">
                                       <node concept="37vLTw" id="7YublcAwDcB" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7YublcAwDcE" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ZN" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="7YublcAwDcC" role="2OqNvi">
                                         <node concept="chp4Y" id="7YublcAwDcD" role="cj9EA">
@@ -793,9 +794,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7YublcAwDcE" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN1ZN" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7YublcAwDcF" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN1ZO" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -806,7 +807,7 @@
                               <node concept="3clFbF" id="7YublcAwDcJ" role="3cqZAp">
                                 <node concept="2OqwBi" id="7YublcAwDcK" role="3clFbG">
                                   <node concept="37vLTw" id="7YublcAwDcL" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7YublcAwDcQ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ZP" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="7YublcAwDcM" role="2OqNvi">
                                     <node concept="1xMEDy" id="7YublcAwDcN" role="1xVPHs">
@@ -819,9 +820,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7YublcAwDcQ" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1ZP" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7YublcAwDcR" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1ZQ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2138,7 +2139,7 @@
                                   <node concept="3clFbF" id="xxE$BMEDt9" role="3cqZAp">
                                     <node concept="2OqwBi" id="xxE$BMEDP6" role="3clFbG">
                                       <node concept="37vLTw" id="xxE$BMEDt8" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="xxE$BMEDsV" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN1ZR" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="xxE$BMEEzC" role="2OqNvi">
                                         <ref role="37wK5l" to="4gky:QRmqzHsFzm" resolve="isInIndex" />
@@ -2146,9 +2147,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="xxE$BMEDsV" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN1ZR" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="xxE$BMEDsW" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN1ZS" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2196,7 +2197,7 @@
                               <node concept="3clFbF" id="xxE$BMDjBI" role="3cqZAp">
                                 <node concept="2OqwBi" id="xxE$BMDjBJ" role="3clFbG">
                                   <node concept="37vLTw" id="xxE$BMDjBK" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="xxE$BMDjBM" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ZT" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="xxE$BMDjBL" role="2OqNvi">
                                     <ref role="37wK5l" to="4gky:QRmqzHsFzm" resolve="isInIndex" />
@@ -2204,9 +2205,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="xxE$BMDjBM" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1ZT" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="xxE$BMDjBN" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN1ZU" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2357,7 +2358,7 @@
                               <node concept="3fqX7Q" id="QRmqzJL0Ij" role="3clFbG">
                                 <node concept="2OqwBi" id="QRmqzJL0Rh" role="3fr31v">
                                   <node concept="37vLTw" id="QRmqzJL0Ix" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="QRmqzJL0A7" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ZV" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="QRmqzJL1eJ" role="2OqNvi">
                                     <node concept="chp4Y" id="QRmqzJL1n1" role="cj9EA">
@@ -2368,9 +2369,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="QRmqzJL0A7" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN1ZV" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="QRmqzJL0A8" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN1ZW" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2381,7 +2382,7 @@
                           <node concept="3clFbF" id="xxE$BMzdw5" role="3cqZAp">
                             <node concept="2OqwBi" id="xxE$BMzdP5" role="3clFbG">
                               <node concept="37vLTw" id="xxE$BMzdw4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="xxE$BMzdvQ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN1ZX" resolve="it" />
                               </node>
                               <node concept="2Rf3mk" id="xxE$BMzeeE" role="2OqNvi">
                                 <node concept="1xMEDy" id="xxE$BMzeeG" role="1xVPHs">
@@ -2394,9 +2395,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="xxE$BMzdvQ" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN1ZX" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="xxE$BMzdvR" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN1ZY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2535,7 +2536,7 @@
                               <node concept="3clFbF" id="xxE$BMEMal" role="3cqZAp">
                                 <node concept="2OqwBi" id="xxE$BMEMyi" role="3clFbG">
                                   <node concept="37vLTw" id="xxE$BMEMak" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="xxE$BMELUD" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN1ZZ" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="xxE$BMEN6V" role="2OqNvi">
                                     <ref role="37wK5l" to="4gky:QRmqzHsFzm" resolve="isInIndex" />
@@ -2543,9 +2544,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="xxE$BMELUD" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN1ZZ" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="xxE$BMELUE" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN200" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2584,7 +2585,7 @@
                           <node concept="3clFbF" id="xxE$BMDez8" role="3cqZAp">
                             <node concept="2OqwBi" id="xxE$BMDeY$" role="3clFbG">
                               <node concept="37vLTw" id="xxE$BMDez7" role="2Oq$k0">
-                                <ref role="3cqZAo" node="xxE$BMDeyT" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN201" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="xxE$BMDfDe" role="2OqNvi">
                                 <ref role="37wK5l" to="4gky:QRmqzHsFzm" resolve="isInIndex" />
@@ -2592,9 +2593,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="xxE$BMDeyT" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN201" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="xxE$BMDeyU" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN202" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.plugin.mps
index 6325f905056..49c05242599 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
@@ -99,7 +99,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,7 +123,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -212,7 +212,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.structure.mps
index 4b24438c9be..24551d1a9f2 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/models/com.mbeddr.doc.gen_markdown.structure.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl
index 35142b6293c..e54ddd88653 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl
@@ -46,7 +46,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -154,7 +154,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -180,7 +179,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -207,7 +206,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/generator/template/com/mbeddr/doc/gen_xhtml/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/generator/template/com/mbeddr/doc/gen_xhtml/generator/template/main@generator.mps
index 0394aa50a86..8a97ce0ebdb 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/generator/template/com/mbeddr/doc/gen_xhtml/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/generator/template/com/mbeddr/doc/gen_xhtml/generator/template/main@generator.mps
@@ -280,6 +280,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -809,7 +810,7 @@
                           </node>
                           <node concept="2OqwBi" id="QRmqzIqxIl" role="37vLTJ">
                             <node concept="37vLTw" id="QRmqzIqxFk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5wmuVxvCImD" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN20d" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="QRmqzIqy6O" role="2OqNvi">
                               <ref role="3Tt5mk" to="lsus:QRmqzIqw10" resolve="cssSpec" />
@@ -822,7 +823,7 @@
                       <node concept="2OqwBi" id="QRmqzIqxiX" role="3uHU7w">
                         <node concept="2OqwBi" id="QRmqzIqwEU" role="2Oq$k0">
                           <node concept="37vLTw" id="QRmqzIqwBF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5wmuVxvCImD" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN20d" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="QRmqzIqx3A" role="2OqNvi">
                             <ref role="3Tt5mk" to="lsus:QRmqzIqw10" resolve="cssSpec" />
@@ -833,7 +834,7 @@
                       <node concept="2OqwBi" id="QRmqzIqtRO" role="3uHU7B">
                         <node concept="2OqwBi" id="QRmqzIqtlh" role="2Oq$k0">
                           <node concept="37vLTw" id="QRmqzIqtin" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5wmuVxvCImD" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN20d" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="QRmqzIqtxZ" role="2OqNvi">
                             <ref role="3TsBF5" to="lsus:3RseghIclET" resolve="stylesheet" />
@@ -844,9 +845,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5wmuVxvCImD" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN20d" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5wmuVxvCImE" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN20e" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5586,7 +5587,7 @@
                       </node>
                       <node concept="2OqwBi" id="QRmqzJoi1m" role="33vP2m">
                         <node concept="37vLTw" id="QRmqzJoi1n" role="2Oq$k0">
-                          <ref role="3cqZAo" node="QRmqzJogZc" resolve="toc" />
+                          <ref role="3cqZAo" node="2SR9xrsN20j" resolve="toc" />
                         </node>
                         <node concept="1_qnLN" id="QRmqzJoi1o" role="2OqNvi">
                           <ref role="1_rbq0" to="lsus:QRmqzJj_qE" resolve="TableOfContents" />
@@ -5629,7 +5630,7 @@
                                   <node concept="3clFbF" id="QRmqzJFNT1" role="3cqZAp">
                                     <node concept="2OqwBi" id="QRmqzJFOWO" role="3clFbG">
                                       <node concept="37vLTw" id="QRmqzJFNT0" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="QRmqzJFMU4" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN20f" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="QRmqzJFQ8b" role="2OqNvi">
                                         <ref role="37wK5l" to="4gky:QRmqzHsFzm" resolve="isInIndex" />
@@ -5637,9 +5638,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="QRmqzJFMU4" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN20f" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="QRmqzJFMU5" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN20g" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -5652,14 +5653,14 @@
                                     <ref role="37wK5l" to="jobd:QRmqzJoHlD" resolve="createTocEntriesRecursive" />
                                     <ref role="1Pybhc" to="jobd:QRmqzHYR8K" resolve="GeneratorHelper" />
                                     <node concept="37vLTw" id="QRmqzJp6i1" role="37wK5m">
-                                      <ref role="3cqZAo" node="QRmqzJo_c2" resolve="section" />
+                                      <ref role="3cqZAo" node="2SR9xrsN20h" resolve="section" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="QRmqzJo_c2" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN20h" role="1bW2Oz">
                                 <property role="TrG5h" value="section" />
-                                <node concept="2jxLKc" id="QRmqzJo_c3" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN20i" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -5668,9 +5669,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="QRmqzJogZc" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN20j" role="1bW2Oz">
                   <property role="TrG5h" value="toc" />
-                  <node concept="2jxLKc" id="QRmqzJogZd" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN20k" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5704,7 +5705,7 @@
                             <node concept="3fqX7Q" id="QRmqzJL0Ij" role="3clFbG">
                               <node concept="2OqwBi" id="QRmqzJL0Rh" role="3fr31v">
                                 <node concept="37vLTw" id="QRmqzJL0Ix" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="QRmqzJL0A7" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN20l" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="QRmqzJL1eJ" role="2OqNvi">
                                   <node concept="chp4Y" id="QRmqzJL1n1" role="cj9EA">
@@ -5715,9 +5716,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="QRmqzJL0A7" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN20l" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="QRmqzJL0A8" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN20m" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5728,7 +5729,7 @@
                         <node concept="3clFbF" id="QRmqzJL3$O" role="3cqZAp">
                           <node concept="2OqwBi" id="QRmqzJL3Hy" role="3clFbG">
                             <node concept="37vLTw" id="QRmqzJL3$N" role="2Oq$k0">
-                              <ref role="3cqZAo" node="QRmqzJL3pU" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN20n" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="QRmqzJL4ef" role="2OqNvi">
                               <node concept="1xIGOp" id="QRmqzJL5G7" role="1xVPHs" />
@@ -5736,9 +5737,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="QRmqzJL3pU" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN20n" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="QRmqzJL3pV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN20o" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5780,7 +5781,7 @@
                       </node>
                       <node concept="2OqwBi" id="QRmqzKqv4U" role="33vP2m">
                         <node concept="37vLTw" id="QRmqzKqv4V" role="2Oq$k0">
-                          <ref role="3cqZAo" node="QRmqzKqutJ" resolve="formattedText" />
+                          <ref role="3cqZAo" node="2SR9xrsN20r" resolve="formattedText" />
                         </node>
                         <node concept="1_qnLN" id="QRmqzKqv4W" role="2OqNvi">
                           <ref role="1_rbq0" to="lsus:QRmqzKqjsY" resolve="KeyPress" />
@@ -5795,7 +5796,7 @@
                       <node concept="2OqwBi" id="QRmqzKqw3Q" role="33vP2m">
                         <node concept="2OqwBi" id="QRmqzKqw3R" role="2Oq$k0">
                           <node concept="37vLTw" id="QRmqzKqw3S" role="2Oq$k0">
-                            <ref role="3cqZAo" node="QRmqzKqutJ" resolve="formattedText" />
+                            <ref role="3cqZAo" node="2SR9xrsN20r" resolve="formattedText" />
                           </node>
                           <node concept="3TrEf2" id="QRmqzKqw3T" role="2OqNvi">
                             <ref role="3Tt5mk" to="2c95:5mf_X_La_N_" resolve="text" />
@@ -5945,16 +5946,16 @@
                                     </node>
                                     <node concept="2OqwBi" id="QRmqzKAo1B" role="37vLTx">
                                       <node concept="37vLTw" id="QRmqzKzT5V" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="QRmqzKqBPY" resolve="splitText" />
+                                        <ref role="3cqZAo" node="2SR9xrsN20p" resolve="splitText" />
                                       </node>
                                       <node concept="17S1cR" id="QRmqzKApla" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="QRmqzKqBPY" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN20p" role="1bW2Oz">
                                 <property role="TrG5h" value="splitText" />
-                                <node concept="2jxLKc" id="QRmqzKqBPZ" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN20q" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -6007,9 +6008,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="QRmqzKqutJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN20r" role="1bW2Oz">
                   <property role="TrG5h" value="formattedText" />
-                  <node concept="2jxLKc" id="QRmqzKqutK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN20s" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6045,7 +6046,7 @@
                       </node>
                       <node concept="2OqwBi" id="QRmqzKAgmc" role="33vP2m">
                         <node concept="37vLTw" id="QRmqzKAgmd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="QRmqzKAgnw" resolve="formattedText" />
+                          <ref role="3cqZAo" node="2SR9xrsN20v" resolve="formattedText" />
                         </node>
                         <node concept="1_qnLN" id="QRmqzKAgme" role="2OqNvi">
                           <ref role="1_rbq0" to="lsus:QRmqzKAgfz" resolve="MenuClick" />
@@ -6060,7 +6061,7 @@
                       <node concept="2OqwBi" id="QRmqzKAgmi" role="33vP2m">
                         <node concept="2OqwBi" id="QRmqzKAgmj" role="2Oq$k0">
                           <node concept="37vLTw" id="QRmqzKAgmk" role="2Oq$k0">
-                            <ref role="3cqZAo" node="QRmqzKAgnw" resolve="formattedText" />
+                            <ref role="3cqZAo" node="2SR9xrsN20v" resolve="formattedText" />
                           </node>
                           <node concept="3TrEf2" id="QRmqzKAgml" role="2OqNvi">
                             <ref role="3Tt5mk" to="2c95:5mf_X_La_N_" resolve="text" />
@@ -6236,16 +6237,16 @@
                                     </node>
                                     <node concept="2OqwBi" id="QRmqzKAmub" role="37vLTx">
                                       <node concept="37vLTw" id="QRmqzKAgn6" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="QRmqzKAgna" resolve="splitText" />
+                                        <ref role="3cqZAo" node="2SR9xrsN20t" resolve="splitText" />
                                       </node>
                                       <node concept="17S1cR" id="QRmqzKAnMi" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="QRmqzKAgna" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN20t" role="1bW2Oz">
                                 <property role="TrG5h" value="splitText" />
-                                <node concept="2jxLKc" id="QRmqzKAgnb" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN20u" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -6298,9 +6299,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="QRmqzKAgnw" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN20v" role="1bW2Oz">
                   <property role="TrG5h" value="formattedText" />
-                  <node concept="2jxLKc" id="QRmqzKAgnx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN20w" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6805,7 +6806,7 @@
                       <node concept="2OqwBi" id="4UrEbl6$9oP" role="33vP2m">
                         <node concept="2OqwBi" id="4UrEbl6$6Fz" role="2Oq$k0">
                           <node concept="37vLTw" id="4UrEbl6$6pI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6ec5ny848CE" resolve="itemList" />
+                            <ref role="3cqZAo" node="2SR9xrsN20_" resolve="itemList" />
                           </node>
                           <node concept="3Tsc0h" id="4UrEbl6$78O" role="2OqNvi">
                             <ref role="3TtcxE" to="2c95:4E$PniRK8Ap" resolve="items" />
@@ -6841,7 +6842,7 @@
                   <node concept="3clFbF" id="7SY$c$hVMNE" role="3cqZAp">
                     <node concept="37vLTI" id="7SY$c$hVNDk" role="3clFbG">
                       <node concept="37vLTw" id="7SY$c$hVOSR" role="37vLTx">
-                        <ref role="3cqZAo" node="6ec5ny848CE" resolve="itemList" />
+                        <ref role="3cqZAo" node="2SR9xrsN20_" resolve="itemList" />
                       </node>
                       <node concept="3EllGN" id="7SY$c$hVNhd" role="37vLTJ">
                         <node concept="3cmrfG" id="7SY$c$hVNpC" role="3ElVtu">
@@ -7034,14 +7035,14 @@
                                               <ref role="cht4Q" to="2c95:4E$PniRJOs$" resolve="Item" />
                                             </node>
                                             <node concept="37vLTw" id="7SY$c$hXhgc" role="1m5AlR">
-                                              <ref role="3cqZAo" node="7SY$c$hXhfy" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN20z" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="7SY$c$hXhfy" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN20z" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="7SY$c$hXhfz" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN20$" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -7152,9 +7153,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6ec5ny848CE" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN20_" role="1bW2Oz">
                   <property role="TrG5h" value="itemList" />
-                  <node concept="2jxLKc" id="6ec5ny848CF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN20A" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/behavior.mps
index ad7c6c1fcc5..c989f7c4228 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/behavior.mps
@@ -66,7 +66,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -103,7 +103,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/constraints.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/constraints.mps
index b504d68f5af..fa3efad16d0 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/constraints.mps
@@ -38,7 +38,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/editor.mps
index 8c62b6872b4..29df408b32e 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/editor.mps
@@ -27,7 +27,7 @@
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -52,7 +52,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/intentions.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/intentions.mps
index 2b94d612768..9f34cd6824b 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/intentions.mps
@@ -99,7 +99,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/migration.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/migration.mps
index 459b8af23e7..da61fb13fcf 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/migration.mps
@@ -57,7 +57,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -66,7 +66,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -81,6 +81,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -143,7 +144,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -168,7 +169,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -286,7 +286,7 @@
                           <node concept="2OqwBi" id="32cJsh9DX2e" role="3clFbG">
                             <node concept="2OqwBi" id="32cJsh9DVNm" role="2Oq$k0">
                               <node concept="37vLTw" id="32cJsh9DVzR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="32cJsh9DVsL" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN203" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="32cJsh9DWuP" role="2OqNvi">
                                 <ref role="3Tt5mk" to="2c95:5gTlpaky6sZ" resolve="renderer" />
@@ -300,9 +300,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="32cJsh9DVsL" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN203" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="32cJsh9DVsM" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN204" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -319,7 +319,7 @@
                           <node concept="2OqwBi" id="32cJsh9Egvt" role="33vP2m">
                             <node concept="2OqwBi" id="32cJsh9Egvu" role="2Oq$k0">
                               <node concept="37vLTw" id="32cJsh9Egvv" role="2Oq$k0">
-                                <ref role="3cqZAo" node="32cJsh9DYJ1" resolve="docEx" />
+                                <ref role="3cqZAo" node="2SR9xrsN207" resolve="docEx" />
                               </node>
                               <node concept="I4A8Y" id="32cJsh9Egvw" role="2OqNvi" />
                             </node>
@@ -343,7 +343,7 @@
                                   <node concept="2OqwBi" id="32cJsh9EE33" role="3clFbG">
                                     <node concept="2OqwBi" id="32cJsh9EBMt" role="2Oq$k0">
                                       <node concept="37vLTw" id="32cJsh9EBv4" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="32cJsh9EAg_" resolve="config" />
+                                        <ref role="3cqZAo" node="2SR9xrsN205" resolve="config" />
                                       </node>
                                       <node concept="3Tsc0h" id="32cJsh9ECnj" role="2OqNvi">
                                         <ref role="3TtcxE" to="2c95:2U5fsQei4zg" resolve="configItems" />
@@ -357,7 +357,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="32cJsh9ELRX" role="1m5AlR">
                                             <node concept="37vLTw" id="32cJsh9EIHG" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="32cJsh9DYJ1" resolve="docEx" />
+                                              <ref role="3cqZAo" node="2SR9xrsN207" resolve="docEx" />
                                             </node>
                                             <node concept="3TrEf2" id="32cJsh9EMY1" role="2OqNvi">
                                               <ref role="3Tt5mk" to="2c95:5gTlpaky6sZ" resolve="renderer" />
@@ -370,9 +370,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="32cJsh9EAg_" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN205" role="1bW2Oz">
                                 <property role="TrG5h" value="config" />
-                                <node concept="2jxLKc" id="32cJsh9EAgA" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN206" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -389,7 +389,7 @@
                           </node>
                           <node concept="2OqwBi" id="32cJsh9ER8e" role="37vLTJ">
                             <node concept="37vLTw" id="32cJsh9EQyn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="32cJsh9DYJ1" resolve="docEx" />
+                              <ref role="3cqZAo" node="2SR9xrsN207" resolve="docEx" />
                             </node>
                             <node concept="3TrEf2" id="32cJsh9ESc5" role="2OqNvi">
                               <ref role="3Tt5mk" to="2c95:5gTlpaky6sZ" resolve="renderer" />
@@ -398,9 +398,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="32cJsh9DYJ1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN207" role="1bW2Oz">
                       <property role="TrG5h" value="docEx" />
-                      <node concept="2jxLKc" id="32cJsh9DYJ2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN208" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/plugin.mps
index 203fb95a17e..81ed5f68c76 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:a38f0e6e-eb07-4712-927b-30c9e021556c(com.mbeddr.doc.gen_xhtml.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@@ -30,7 +30,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -89,7 +89,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -108,13 +108,14 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -182,7 +183,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -193,7 +194,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -292,7 +292,7 @@
                         <node concept="3clFbF" id="QRmqzJG8Jp" role="3cqZAp">
                           <node concept="2OqwBi" id="QRmqzJG9L0" role="3clFbG">
                             <node concept="37vLTw" id="QRmqzJG8Jo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="QRmqzJG8rN" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN209" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="QRmqzJGca$" role="2OqNvi">
                               <ref role="37wK5l" to="4gky:QRmqzHsFzm" resolve="isInIndex" />
@@ -300,9 +300,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="QRmqzJG8rN" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN209" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="QRmqzJG8rO" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN20a" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -314,14 +314,14 @@
                         <node concept="1rXfSq" id="QRmqzJp4hk" role="3clFbG">
                           <ref role="37wK5l" node="QRmqzJoHlD" resolve="createTocEntriesRecursive" />
                           <node concept="37vLTw" id="QRmqzJp4Gv" role="37wK5m">
-                            <ref role="3cqZAo" node="QRmqzJp37J" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN20b" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="QRmqzJp37J" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN20b" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="QRmqzJp37K" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN20c" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/structure.mps
index 163542597d4..d9feda1b5d8 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/structure.mps
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/textGen.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/textGen.mps
index 7fe46a1e999..e4507e0ebb1 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageModels/textGen.mps
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 2c827023cc0..eba73ff9038 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
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/behavior.mps
index 80dac08f492..377764a9608 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/behavior.mps
@@ -52,7 +52,7 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -60,7 +60,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -71,7 +71,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/editor.mps
index ccb3ca6c72c..e152fdbee90 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/editor.mps
@@ -50,7 +50,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/intentions.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/intentions.mps
index aeafadc9b37..9a088fa5055 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/intentions.mps
@@ -47,7 +47,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/structure.mps
index 8e1a8424fcc..443a6629653 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/structure.mps
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/textGen.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/textGen.mps
index 22a77424f87..6aa52e9c26f 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/languageModels/textGen.mps
@@ -81,7 +81,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,12 +94,13 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -144,7 +145,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -160,7 +161,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -499,7 +499,7 @@
                       <node concept="3fqX7Q" id="2bUgBpZU0nm" role="3clFbG">
                         <node concept="2OqwBi" id="2bUgBpZU0nn" role="3fr31v">
                           <node concept="37vLTw" id="2bUgBpZU0no" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2bUgBpZU0md" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN20B" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2bUgBpZU0np" role="2OqNvi">
                             <ref role="37wK5l" to="yxvu:2bUgBpZU0mI" resolve="isEmpty" />
@@ -508,9 +508,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2bUgBpZU0md" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN20B" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2bUgBpZU0me" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN20C" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl
index 278b623386d..627ab742f39 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,7 +54,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
@@ -68,7 +67,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/generator/templates/com.mbeddr.doc.markdown.generator.templates@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/generator/templates/com.mbeddr.doc.markdown.generator.templates@generator.mps
index d4fc528e84f..c0e2612c42e 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/generator/templates/com.mbeddr.doc.markdown.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/generator/templates/com.mbeddr.doc.markdown.generator.templates@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.behavior.mps
index 2109981d852..9e198b850c8 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.behavior.mps
@@ -107,7 +107,7 @@
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,7 +116,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -172,7 +172,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.editor.mps
index aa92ce5861b..e5378301d2b 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.editor.mps
@@ -19,7 +19,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -61,15 +61,15 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -110,7 +110,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -168,7 +168,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -238,7 +238,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.structure.mps
index f5d3be55bf2..5fd1aec3353 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -296,14 +296,6 @@
     <property role="R4oN_" value="a header (level 4)" />
     <ref role="1TJDcQ" node="2ft2HgFmzGD" resolve="Header" />
   </node>
-  <node concept="1TIwiD" id="4zO5iT9sZu1">
-    <property role="EcuMT" value="5256849953593227137" />
-    <property role="TrG5h" value="Header5" />
-    <property role="34LRSv" value="#####" />
-    <property role="3GE5qa" value="header" />
-    <property role="R4oN_" value="a header (level 5)" />
-    <ref role="1TJDcQ" node="2ft2HgFmzGD" resolve="Header" />
-  </node>
   <node concept="1TIwiD" id="4zO5iT9sZ$8">
     <property role="EcuMT" value="5256849953593227528" />
     <property role="TrG5h" value="Header6" />
@@ -312,5 +304,13 @@
     <property role="R4oN_" value="a header (level 6)" />
     <ref role="1TJDcQ" node="2ft2HgFmzGD" resolve="Header" />
   </node>
+  <node concept="1TIwiD" id="4zO5iT9sZu1">
+    <property role="EcuMT" value="5256849953593227137" />
+    <property role="TrG5h" value="Header5" />
+    <property role="34LRSv" value="#####" />
+    <property role="3GE5qa" value="header" />
+    <property role="R4oN_" value="a header (level 5)" />
+    <ref role="1TJDcQ" node="2ft2HgFmzGD" resolve="Header" />
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.textGen.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.textGen.mps
index 70b4befa065..890d54b26cf 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.textGen.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/models/com.mbeddr.doc.markdown.textGen.mps
@@ -61,7 +61,7 @@
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -133,7 +133,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl
index 33b59892b96..d62cfcb064c 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl
@@ -38,7 +38,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -108,7 +108,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -128,7 +127,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -150,7 +149,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/generator/template/com/mbeddr/doc/meta/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/generator/template/com/mbeddr/doc/meta/generator/template/main@generator.mps
index 2255170d94a..70ff0d644d1 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/generator/template/com/mbeddr/doc/meta/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/generator/template/com/mbeddr/doc/meta/generator/template/main@generator.mps
@@ -17,7 +17,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/behavior.mps
index db0f23d0669..4f3b72b43cb 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/behavior.mps
@@ -45,7 +45,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -108,7 +108,7 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,7 +124,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -149,7 +149,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/com.mbeddr.doc.meta.migration.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/com.mbeddr.doc.meta.migration.mps
index 92fcc24ba44..27179a06898 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/com.mbeddr.doc.meta.migration.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/com.mbeddr.doc.meta.migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -57,7 +57,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -67,7 +67,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -126,7 +126,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/editor.mps
index c91534f8673..dede2be3f7b 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/editor.mps
@@ -77,7 +77,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -106,7 +106,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -192,7 +192,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -212,7 +212,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -258,7 +258,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/structure.mps
index 63c27e844f4..eaf76f737c0 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/languageModels/structure.mps
@@ -36,7 +36,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 fd29127ee3f..2669e2de7ef 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
@@ -35,7 +35,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -88,7 +88,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">0c8e0d19-c3cf-4b31-af77-531227edbce8(com.mbeddr.core.qa)</dependency>
@@ -99,7 +98,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/generator/template/main@generator.mps
index bc7e2a94855..d15718dbdae 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/generator/template/main@generator.mps
@@ -14,7 +14,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/behavior.mps
index 80c6494304b..b174e4bd0b2 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/behavior.mps
@@ -84,19 +84,20 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -133,7 +134,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -148,7 +149,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -250,7 +250,7 @@
                       <node concept="2OqwBi" id="5r_qjlVc5q" role="3clFbG">
                         <node concept="2OqwBi" id="5r_qjlVc5r" role="2Oq$k0">
                           <node concept="37vLTw" id="5r_qjlVc5s" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5r_qjlVc5v" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN20G" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5r_qjlVc5t" role="2OqNvi">
                             <ref role="3Tt5mk" to="2c95:627_yy34G16" resolve="codeptr" />
@@ -262,9 +262,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5r_qjlVc5v" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN20G" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5r_qjlVc5w" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN20H" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -294,16 +294,16 @@
                           </node>
                           <node concept="3JPx81" id="5r_qjlVfsM" role="2OqNvi">
                             <node concept="37vLTw" id="5r_qjlVfsN" role="25WWJ7">
-                              <ref role="3cqZAo" node="5r_qjlVfsO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN20I" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5r_qjlVfsO" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN20I" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5r_qjlVfsP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN20J" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -338,7 +338,7 @@
                     <node concept="3clFbF" id="5r_qjlVo4K" role="3cqZAp">
                       <node concept="37vLTI" id="5r_qjlVp6N" role="3clFbG">
                         <node concept="37vLTw" id="5r_qjlVpcw" role="37vLTx">
-                          <ref role="3cqZAo" node="5r_qjlVmyd" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN20K" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="5r_qjlVogX" role="37vLTJ">
                           <node concept="37vLTw" id="5r_qjlVo4J" role="2Oq$k0">
@@ -356,9 +356,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5r_qjlVmyd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN20K" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5r_qjlVmye" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN20L" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -509,7 +509,7 @@
                       <node concept="2OqwBi" id="5r_qjlVNgT" role="3clFbG">
                         <node concept="2OqwBi" id="5r_qjlVNgU" role="2Oq$k0">
                           <node concept="37vLTw" id="5r_qjlVNgV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5r_qjlVNgY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN20M" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5r_qjlVNgW" role="2OqNvi">
                             <ref role="3Tt5mk" to="2c95:627_yy34G16" resolve="codeptr" />
@@ -521,9 +521,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5r_qjlVNgY" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN20M" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5r_qjlVNgZ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN20N" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -553,16 +553,16 @@
                           </node>
                           <node concept="3JPx81" id="5r_qjlVNhd" role="2OqNvi">
                             <node concept="37vLTw" id="5r_qjlVNhe" role="25WWJ7">
-                              <ref role="3cqZAo" node="5r_qjlVNhf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN20O" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5r_qjlVNhf" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN20O" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5r_qjlVNhg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN20P" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -597,7 +597,7 @@
                     <node concept="3clFbF" id="5r_qjlVNhv" role="3cqZAp">
                       <node concept="37vLTI" id="5r_qjlVNhw" role="3clFbG">
                         <node concept="37vLTw" id="5r_qjlVNhx" role="37vLTx">
-                          <ref role="3cqZAo" node="5r_qjlVNhB" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN20Q" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="5r_qjlVNhy" role="37vLTJ">
                           <node concept="37vLTw" id="5r_qjlVNhz" role="2Oq$k0">
@@ -615,9 +615,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5r_qjlVNhB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN20Q" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5r_qjlVNhC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN20R" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/editor.mps
index 4fcbe8d0c07..f6eeaa784d8 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/editor.mps
@@ -43,7 +43,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/structure.mps
index b92a633f7cf..af0417e3b2e 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/languageModels/structure.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl
index 0c5eda594c3..5d34c24deaa 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl
@@ -41,7 +41,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -112,7 +112,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
@@ -126,7 +125,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -145,7 +144,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/generator/template/com/mbeddr/doc/self/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/generator/template/com/mbeddr/doc/self/generator/template/main@generator.mps
index 771fbed84da..a7b832b927f 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/generator/template/com/mbeddr/doc/self/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/generator/template/com/mbeddr/doc/self/generator/template/main@generator.mps
@@ -79,7 +79,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136263187" name="com.mbeddr.doc.structure.ImageParagraph" flags="ng" index="2SaynC">
@@ -123,7 +123,7 @@
         <child id="5785245534401182264" name="defaultTempPath" index="Cbewh" />
         <child id="6386504476136472817" name="paths" index="2SbYGa" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596579911728" name="com.mbeddr.doc.structure.Document" flags="ng" index="1_1swa" />
@@ -247,7 +247,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/behavior.mps
index 67443f247c3..70f049334a7 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/behavior.mps
@@ -45,14 +45,14 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps
index 0e61dbf2b8f..60335f9e9a2 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -59,7 +59,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -73,13 +73,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/constraints.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/constraints.mps
index 8ae882fdb16..a2caed5ba86 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/constraints.mps
@@ -38,7 +38,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -60,6 +60,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -78,7 +79,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -86,7 +87,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -119,7 +119,7 @@
                         <node concept="3fqX7Q" id="5CkU_dHilRf" role="3clFbG">
                           <node concept="2OqwBi" id="5CkU_dHilRg" role="3fr31v">
                             <node concept="37vLTw" id="5CkU_dHilRh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHilRk" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN20T" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5CkU_dHilRi" role="2OqNvi">
                               <node concept="chp4Y" id="5CkU_dHilRj" role="cj9EA">
@@ -130,9 +130,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHilRk" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN20T" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHilRl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN20U" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/editor.mps
index 46967f08199..81d5a771860 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/editor.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
+    <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -47,7 +47,7 @@
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -63,7 +63,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -94,7 +94,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -221,6 +221,7 @@
           <ref role="1NtTu8" to="z5ox:54ozzUwooJ9" resolve="hints" />
           <node concept="l2Vlx" id="54ozzUwopex" role="2czzBx" />
         </node>
+        <node concept="l2Vlx" id="7$DvC4gSARM" role="2iSdaV" />
         <node concept="3F0ifn" id="UZf0JknA9G" role="3EZMnx">
           <property role="3F0ifm" value="render the inspector:" />
           <node concept="pVoyu" id="UZf0JknAay" role="3F10Kt">
@@ -233,7 +234,6 @@
         <node concept="27S6Sx" id="7yQnM2MA0yD" role="3EZMnx">
           <ref role="1NtTu8" to="z5ox:UZf0Jkn_ZE" resolve="renderInspector" />
         </node>
-        <node concept="l2Vlx" id="7$DvC4gSARM" role="2iSdaV" />
       </node>
       <node concept="3F1sOY" id="7$DvC4gQTZ8" role="3EZMnx">
         <ref role="1NtTu8" to="z5ox:7$DvC4gQTYZ" resolve="description" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/structure.mps
index 51f752e960e..b5f86697eaa 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/structure.mps
@@ -40,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -51,11 +51,6 @@
     <property role="EcuMT" value="6416473402306197330" />
     <property role="R4oN_" value="embed a section as an image" />
     <ref role="1TJDcQ" to="2c95:2TZO3DbvcVJ" resolve="AbstractParagraph" />
-    <node concept="1TJgyi" id="UZf0Jkn_ZE" role="1TKVEl">
-      <property role="IQ2nx" value="1062634058587987946" />
-      <property role="TrG5h" value="renderInspector" />
-      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-    </node>
     <node concept="1TJgyj" id="5$bT90ZcZtG" role="1TKVEi">
       <property role="20kJfa" value="path" />
       <property role="20lbJX" value="fLJekj4/_1" />
@@ -95,6 +90,11 @@
       <property role="IQ2ns" value="5843576916143082441" />
       <ref role="20lvS9" to="tpc2:5UHFGFk4ozs" resolve="ConceptEditorHintDeclarationReference" />
     </node>
+    <node concept="1TJgyi" id="UZf0Jkn_ZE" role="1TKVEl">
+      <property role="IQ2nx" value="1062634058587987946" />
+      <property role="TrG5h" value="renderInspector" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl
index 14aca7d529b..2b15ff11830 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl
@@ -44,7 +44,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -164,7 +164,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b33d119e-196d-4497-977c-5c167b21fe33(com.mbeddr.mpsutil.framecell)</dependency>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -206,7 +205,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -228,7 +227,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
@@ -296,7 +295,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)" version="0" />
     <module reference="5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)" version="0" />
     <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com.mbeddr.doc.generator.template.utils.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com.mbeddr.doc.generator.template.utils.mps
index 4d4cc668ee3..4d2f8cd85f6 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com.mbeddr.doc.generator.template.utils.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com.mbeddr.doc.generator.template.utils.mps
@@ -48,7 +48,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -59,7 +59,7 @@
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -91,7 +91,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 cecc3031f10..133466943de 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
@@ -6,7 +6,7 @@
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <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="d3a0fd26-445a-466c-900e-10444ddfed52" name="com.mbeddr.mpsutil.filepicker" version="-1" />
@@ -300,6 +300,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -504,7 +505,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
@@ -1643,7 +1643,7 @@
                         <node concept="2OqwBi" id="49PUF$HThrH" role="3clFbG">
                           <node concept="2OqwBi" id="49PUF$HTgAZ" role="2Oq$k0">
                             <node concept="37vLTw" id="49PUF$HTgj$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="49PUF$HTgfo" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22H" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="49PUF$HTh0j" role="2OqNvi">
                               <node concept="3CFYIy" id="49PUF$HTh9P" role="3CFYIz">
@@ -1655,9 +1655,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="49PUF$HTgfo" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN22H" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="49PUF$HTgfp" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN22I" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1683,7 +1683,7 @@
                         <node concept="2OqwBi" id="3k8awrHXWLW" role="3clFbG">
                           <node concept="2OqwBi" id="3k8awrHXW6W" role="2Oq$k0">
                             <node concept="37vLTw" id="3k8awrHXVR1" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3k8awrHXVMH" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22J" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="3k8awrHXWrY" role="2OqNvi">
                               <node concept="3CFYIy" id="3k8awrHXWzx" role="3CFYIz">
@@ -1695,9 +1695,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3k8awrHXVMH" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN22J" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3k8awrHXVMI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN22K" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2173,14 +2173,14 @@
                       <ref role="37wK5l" to="4gky:6jiGbW_zIRh" resolve="setStableId" />
                       <ref role="1Pybhc" to="4gky:6jiGbW_zIPK" resolve="StableIdHelper" />
                       <node concept="37vLTw" id="6jiGbW_zLuL" role="37wK5m">
-                        <ref role="3cqZAo" node="6jiGbW_aSUm" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN22L" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6jiGbW_aSUm" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN22L" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6jiGbW_aSUn" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN22M" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2442,16 +2442,16 @@
                                 </node>
                                 <node concept="3JPx81" id="5mrX3Ufo$Or" role="2OqNvi">
                                   <node concept="37vLTw" id="5mrX3Ufo$Os" role="25WWJ7">
-                                    <ref role="3cqZAo" node="5mrX3Ufoofc" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN22N" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5mrX3Ufoofc" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN22N" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5mrX3Ufoofd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN22O" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2578,7 +2578,7 @@
                               <node concept="2OqwBi" id="4PBxP351IP8" role="3clFbG">
                                 <node concept="2OqwBi" id="4PBxP351IP9" role="2Oq$k0">
                                   <node concept="37vLTw" id="4PBxP351IPa" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4PBxP351IPe" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN22P" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="4PBxP351IPb" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2593,9 +2593,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4PBxP351IPe" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN22P" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4PBxP351IPf" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN22Q" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2632,7 +2632,7 @@
                               <node concept="2OqwBi" id="mQGf9iK4XU" role="3clFbG">
                                 <node concept="2OqwBi" id="mQGf9iK4XV" role="2Oq$k0">
                                   <node concept="37vLTw" id="mQGf9iK4XW" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="mQGf9iK4Y0" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN22R" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="mQGf9iK4XX" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2647,9 +2647,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="mQGf9iK4Y0" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN22R" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="mQGf9iK4Y1" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN22S" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2767,7 +2767,7 @@
                               <node concept="2OqwBi" id="8QSRajGkBQ" role="3clFbG">
                                 <node concept="2OqwBi" id="8QSRajGkBR" role="2Oq$k0">
                                   <node concept="37vLTw" id="8QSRajGkBS" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="8QSRajGkBW" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN22T" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="8QSRajGkBT" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2792,9 +2792,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="8QSRajGkBW" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN22T" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="8QSRajGkBX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN22U" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2874,7 +2874,7 @@
                             <node concept="2OqwBi" id="8QSRajPi7t" role="3uHU7B">
                               <node concept="2OqwBi" id="8QSRajPi7u" role="2Oq$k0">
                                 <node concept="37vLTw" id="8QSRajPi7v" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="8QSRajPi7y" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN22V" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="8QSRajPi7w" role="2OqNvi">
                                   <ref role="3Tt5mk" to="2c95:5gTlpaky6t1" resolve="root" />
@@ -2887,9 +2887,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="8QSRajPi7y" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN22V" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="8QSRajPi7z" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN22W" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2988,15 +2988,15 @@
                                     <node concept="3clFbF" id="8QSRajPt_5" role="3cqZAp">
                                       <node concept="2OqwBi" id="8QSRajPtIO" role="3clFbG">
                                         <node concept="37vLTw" id="8QSRajPt_4" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="8QSRajPtu4" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN22X" resolve="it" />
                                         </node>
                                         <node concept="1$rogu" id="8QSRajPtXK" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="8QSRajPtu4" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN22X" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="8QSRajPtu5" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN22Y" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -3086,7 +3086,7 @@
                               <node concept="2OqwBi" id="mQGf9iJKlm" role="3clFbG">
                                 <node concept="2OqwBi" id="mQGf9iJKln" role="2Oq$k0">
                                   <node concept="37vLTw" id="mQGf9iJKlo" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="mQGf9iJKls" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN22Z" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="mQGf9iJKlp" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3101,9 +3101,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="mQGf9iJKls" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN22Z" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="mQGf9iJKlt" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN230" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3269,7 +3269,7 @@
                             <node concept="2OqwBi" id="3lxJBjijLoP" role="2Oq$k0">
                               <node concept="2OqwBi" id="3lxJBjijKPd" role="2Oq$k0">
                                 <node concept="37vLTw" id="3lxJBjijKBE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3lxJBjijK_k" resolve="export" />
+                                  <ref role="3cqZAo" node="2SR9xrsN23d" resolve="export" />
                                 </node>
                                 <node concept="3TrEf2" id="3lxJBjijLdZ" role="2OqNvi">
                                   <ref role="3Tt5mk" to="2c95:5gTlpaky6t1" resolve="root" />
@@ -3298,7 +3298,7 @@
                               <node concept="2OqwBi" id="3lxJBjiqtqg" role="3clFbG">
                                 <node concept="2OqwBi" id="3lxJBjiqq8o" role="2Oq$k0">
                                   <node concept="37vLTw" id="3lxJBjiqpQg" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3lxJBjikdRi" resolve="document" />
+                                    <ref role="3cqZAo" node="2SR9xrsN23b" resolve="document" />
                                   </node>
                                   <node concept="2Rf3mk" id="3lxJBjiqqNO" role="2OqNvi">
                                     <node concept="1xMEDy" id="3lxJBjiqqNQ" role="1xVPHs">
@@ -3321,7 +3321,7 @@
                                             <node concept="2OqwBi" id="5FHtHFpZYJM" role="2Oq$k0">
                                               <node concept="2OqwBi" id="5FHtHFpZYJN" role="2Oq$k0">
                                                 <node concept="37vLTw" id="5FHtHFpZYJO" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3lxJBjiqwol" resolve="include" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN239" resolve="include" />
                                                 </node>
                                                 <node concept="3TrEf2" id="5FHtHFpZYJP" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="2c95:5mf_X_Lbqjz" resolve="ref" />
@@ -3363,19 +3363,19 @@
                                                 <node concept="3clFbF" id="3lxJBjiqG0y" role="3cqZAp">
                                                   <node concept="2OqwBi" id="3lxJBjiqGTh" role="3clFbG">
                                                     <node concept="37vLTw" id="3lxJBjiqG0x" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="3lxJBjiqwol" resolve="include" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN239" resolve="include" />
                                                     </node>
                                                     <node concept="HtX7F" id="3lxJBjiqHn4" role="2OqNvi">
                                                       <node concept="37vLTw" id="5FHtHFpWnnq" role="HtX7I">
-                                                        <ref role="3cqZAo" node="3lxJBjiqFaW" resolve="newContent" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN231" resolve="newContent" />
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="Rh6nW" id="3lxJBjiqFaW" role="1bW2Oz">
+                                              <node concept="gl6BB" id="2SR9xrsN231" role="1bW2Oz">
                                                 <property role="TrG5h" value="newContent" />
-                                                <node concept="2jxLKc" id="3lxJBjiqFaX" role="1tU5fm" />
+                                                <node concept="2jxLKc" id="2SR9xrsN232" role="1tU5fm" />
                                               </node>
                                             </node>
                                           </node>
@@ -4243,7 +4243,7 @@
                                             <node concept="2OqwBi" id="5FHtHFq09t9" role="2Oq$k0">
                                               <node concept="2OqwBi" id="5FHtHFq09ta" role="2Oq$k0">
                                                 <node concept="37vLTw" id="5FHtHFq09tb" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3lxJBjikdRi" resolve="document" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN23b" resolve="document" />
                                                 </node>
                                                 <node concept="2Rf3mk" id="5FHtHFq09tc" role="2OqNvi">
                                                   <node concept="1xIGOp" id="5FHtHFq09td" role="1xVPHs" />
@@ -4255,15 +4255,15 @@
                                                     <node concept="3clFbF" id="5FHtHFq09th" role="3cqZAp">
                                                       <node concept="2OqwBi" id="5FHtHFq09ti" role="3clFbG">
                                                         <node concept="37vLTw" id="5FHtHFq09tj" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="5FHtHFq09tl" resolve="it" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN233" resolve="it" />
                                                         </node>
                                                         <node concept="2z74zc" id="5FHtHFq09tk" role="2OqNvi" />
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="Rh6nW" id="5FHtHFq09tl" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="2SR9xrsN233" role="1bW2Oz">
                                                     <property role="TrG5h" value="it" />
-                                                    <node concept="2jxLKc" id="5FHtHFq09tm" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="2SR9xrsN234" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -4277,7 +4277,7 @@
                                                         <node concept="2OqwBi" id="8QSRajxoz0" role="2Oq$k0">
                                                           <node concept="2OqwBi" id="8QSRajxmhq" role="2Oq$k0">
                                                             <node concept="37vLTw" id="8QSRajxlvP" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="7U$sKL0zGeJ" resolve="it" />
+                                                              <ref role="3cqZAo" node="2SR9xrsN235" resolve="it" />
                                                             </node>
                                                             <node concept="2ZHEkA" id="8QSRajxnzo" role="2OqNvi" />
                                                           </node>
@@ -4291,12 +4291,12 @@
                                                       </node>
                                                       <node concept="17QLQc" id="7U$sKL0zPhy" role="3uHU7w">
                                                         <node concept="37vLTw" id="7U$sKL0zRjo" role="3uHU7w">
-                                                          <ref role="3cqZAo" node="3lxJBjikdRi" resolve="document" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN23b" resolve="document" />
                                                         </node>
                                                         <node concept="2OqwBi" id="8QSRaj6X6g" role="3uHU7B">
                                                           <node concept="2OqwBi" id="8QSRaj6X6h" role="2Oq$k0">
                                                             <node concept="37vLTw" id="8QSRaj6X6i" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="7U$sKL0zGeJ" resolve="it" />
+                                                              <ref role="3cqZAo" node="2SR9xrsN235" resolve="it" />
                                                             </node>
                                                             <node concept="2ZHEkA" id="8QSRaj6X6j" role="2OqNvi" />
                                                           </node>
@@ -4306,9 +4306,9 @@
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="Rh6nW" id="7U$sKL0zGeJ" role="1bW2Oz">
+                                                <node concept="gl6BB" id="2SR9xrsN235" role="1bW2Oz">
                                                   <property role="TrG5h" value="it" />
-                                                  <node concept="2jxLKc" id="7U$sKL0zGeK" role="1tU5fm" />
+                                                  <node concept="2jxLKc" id="2SR9xrsN236" role="1tU5fm" />
                                                 </node>
                                               </node>
                                             </node>
@@ -4347,7 +4347,7 @@
                                             <node concept="2OqwBi" id="7U$sKL0zAra" role="2Oq$k0">
                                               <node concept="2OqwBi" id="7U$sKL0zArb" role="2Oq$k0">
                                                 <node concept="37vLTw" id="7U$sKL0zArc" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3lxJBjikdRi" resolve="document" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN23b" resolve="document" />
                                                 </node>
                                                 <node concept="2Rf3mk" id="7U$sKL0zArd" role="2OqNvi">
                                                   <node concept="1xMEDy" id="7U$sKL0zAre" role="1xVPHs">
@@ -4421,7 +4421,7 @@
                                                       <ref role="1Pybhc" to="fwk:~TracingUtil" resolve="TracingUtil" />
                                                       <node concept="2OqwBi" id="7U$sKL0zArI" role="37wK5m">
                                                         <node concept="37vLTw" id="7U$sKL0zArJ" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="7U$sKL0zAs7" resolve="reference" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN237" resolve="reference" />
                                                         </node>
                                                         <node concept="2ZHEkA" id="7U$sKL0zArK" role="2OqNvi" />
                                                       </node>
@@ -4454,7 +4454,7 @@
                                                             <ref role="3uigEE" to="w1kc:~StaticReference" resolve="StaticReference" />
                                                           </node>
                                                           <node concept="37vLTw" id="7U$sKL0zArY" role="0kSFX">
-                                                            <ref role="3cqZAo" node="7U$sKL0zAs7" resolve="reference" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN237" resolve="reference" />
                                                           </node>
                                                         </node>
                                                         <node concept="liA8E" id="7U$sKL0zArZ" role="2OqNvi">
@@ -4481,9 +4481,9 @@
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="Rh6nW" id="7U$sKL0zAs7" role="1bW2Oz">
+                                              <node concept="gl6BB" id="2SR9xrsN237" role="1bW2Oz">
                                                 <property role="TrG5h" value="reference" />
-                                                <node concept="2jxLKc" id="7U$sKL0zAs8" role="1tU5fm" />
+                                                <node concept="2jxLKc" id="2SR9xrsN238" role="1tU5fm" />
                                               </node>
                                             </node>
                                           </node>
@@ -4492,33 +4492,33 @@
                                       <node concept="3clFbF" id="5FHtHFpZ$MM" role="3cqZAp">
                                         <node concept="2OqwBi" id="5FHtHFpZ_as" role="3clFbG">
                                           <node concept="37vLTw" id="5FHtHFpZ$MK" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3lxJBjiqwol" resolve="include" />
+                                            <ref role="3cqZAo" node="2SR9xrsN239" resolve="include" />
                                           </node>
                                           <node concept="3YRAZt" id="5FHtHFpZAlu" role="2OqNvi" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3lxJBjiqwol" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN239" role="1bW2Oz">
                                       <property role="TrG5h" value="include" />
-                                      <node concept="2jxLKc" id="3lxJBjiqwom" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN23a" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3lxJBjikdRi" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN23b" role="1bW2Oz">
                             <property role="TrG5h" value="document" />
-                            <node concept="2jxLKc" id="3lxJBjikdRj" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN23c" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3lxJBjijK_k" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN23d" role="1bW2Oz">
                   <property role="TrG5h" value="export" />
-                  <node concept="2jxLKc" id="3lxJBjijK_l" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN23e" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4673,12 +4673,12 @@
                                 <node concept="3clFbF" id="7U$sKL0$Iq8" role="3cqZAp">
                                   <node concept="17R0WA" id="7U$sKL0$Kbj" role="3clFbG">
                                     <node concept="37vLTw" id="7U$sKL0$K$U" role="3uHU7w">
-                                      <ref role="3cqZAo" node="7U$sKL0$FjR" resolve="document" />
+                                      <ref role="3cqZAo" node="2SR9xrsN23h" resolve="document" />
                                     </node>
                                     <node concept="2OqwBi" id="7U$sKL0$Jlb" role="3uHU7B">
                                       <node concept="2OqwBi" id="7U$sKL0$IFc" role="2Oq$k0">
                                         <node concept="37vLTw" id="7U$sKL0$Iq7" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7U$sKL0$Ijx" resolve="export" />
+                                          <ref role="3cqZAo" node="2SR9xrsN23f" resolve="export" />
                                         </node>
                                         <node concept="3TrEf2" id="7U$sKL0$J2b" role="2OqNvi">
                                           <ref role="3Tt5mk" to="2c95:5gTlpaky6t1" resolve="root" />
@@ -4691,9 +4691,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7U$sKL0$Ijx" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN23f" role="1bW2Oz">
                                 <property role="TrG5h" value="export" />
-                                <node concept="2jxLKc" id="7U$sKL0$Ijy" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN23g" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4701,9 +4701,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7U$sKL0$FjR" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23h" role="1bW2Oz">
                     <property role="TrG5h" value="document" />
-                    <node concept="2jxLKc" id="7U$sKL0$FjS" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN23i" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4737,11 +4737,11 @@
                                   <node concept="1eOMI4" id="7U$sKL0$N4r" role="3uHU7B">
                                     <node concept="17R0WA" id="7U$sKL0$N4s" role="1eOMHV">
                                       <node concept="37vLTw" id="7U$sKL0$ODT" role="3uHU7w">
-                                        <ref role="3cqZAo" node="7U$sKL0$LkL" resolve="document" />
+                                        <ref role="3cqZAo" node="2SR9xrsN23n" resolve="document" />
                                       </node>
                                       <node concept="2OqwBi" id="7U$sKL0$N4y" role="3uHU7B">
                                         <node concept="37vLTw" id="7U$sKL0$N4z" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7U$sKL0$N4F" resolve="ref" />
+                                          <ref role="3cqZAo" node="2SR9xrsN23j" resolve="ref" />
                                         </node>
                                         <node concept="3TrEf2" id="7U$sKL0$N4$" role="2OqNvi">
                                           <ref role="3Tt5mk" to="2c95:2TZO3DbvI5E" resolve="doc" />
@@ -4753,7 +4753,7 @@
                                     <node concept="17R0WA" id="7U$sKL0$N4A" role="1eOMHV">
                                       <node concept="2OqwBi" id="7U$sKL0$N4B" role="3uHU7B">
                                         <node concept="37vLTw" id="7U$sKL0$N4C" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7U$sKL0$N4F" resolve="ref" />
+                                          <ref role="3cqZAo" node="2SR9xrsN23j" resolve="ref" />
                                         </node>
                                         <node concept="2NL2c5" id="7U$sKL0$N4D" role="2OqNvi" />
                                       </node>
@@ -4766,9 +4766,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7U$sKL0$N4F" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN23j" role="1bW2Oz">
                               <property role="TrG5h" value="ref" />
-                              <node concept="2jxLKc" id="7U$sKL0$N4G" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN23k" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -4786,15 +4786,15 @@
                             <node concept="3clFbF" id="7U$sKL0$PPm" role="3cqZAp">
                               <node concept="2OqwBi" id="7U$sKL0$Q5F" role="3clFbG">
                                 <node concept="37vLTw" id="7U$sKL0$PPl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7U$sKL0$P$i" resolve="ref" />
+                                  <ref role="3cqZAo" node="2SR9xrsN23l" resolve="ref" />
                                 </node>
                                 <node concept="3YRAZt" id="7U$sKL0$QlM" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7U$sKL0$P$i" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN23l" role="1bW2Oz">
                             <property role="TrG5h" value="ref" />
-                            <node concept="2jxLKc" id="7U$sKL0$P$j" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN23m" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4805,7 +4805,7 @@
                       <node concept="3clFbF" id="7U$sKL0$LmK" role="3cqZAp">
                         <node concept="2OqwBi" id="7U$sKL0$LDe" role="3clFbG">
                           <node concept="37vLTw" id="7U$sKL0$LmJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7U$sKL0$LkL" resolve="document" />
+                            <ref role="3cqZAo" node="2SR9xrsN23n" resolve="document" />
                           </node>
                           <node concept="3YRAZt" id="7U$sKL0$MOU" role="2OqNvi" />
                         </node>
@@ -4818,16 +4818,16 @@
                         </node>
                         <node concept="3JPx81" id="2VXLfnCAgoc" role="2OqNvi">
                           <node concept="37vLTw" id="2VXLfnCAgod" role="25WWJ7">
-                            <ref role="3cqZAo" node="7U$sKL0$LkL" resolve="document" />
+                            <ref role="3cqZAo" node="2SR9xrsN23n" resolve="document" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7U$sKL0$LkL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN23n" role="1bW2Oz">
                   <property role="TrG5h" value="document" />
-                  <node concept="2jxLKc" id="7U$sKL0$LkM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN23o" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
index 2bb571f9ae6..366aeadd036 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
@@ -186,7 +186,7 @@
       <concept id="1154542696413" name="jetbrains.mps.baseLanguage.structure.ArrayCreatorWithInitializer" flags="nn" index="3g6Rrh">
         <child id="1154542793668" name="componentType" index="3g7fb8" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -212,7 +212,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -236,6 +236,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -334,7 +335,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -390,7 +391,6 @@
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
@@ -588,7 +588,7 @@
                           <node concept="17QB3L" id="jpyKDg2iih" role="1tU5fm" />
                           <node concept="2OqwBi" id="jpyKDg2iii" role="33vP2m">
                             <node concept="37vLTw" id="jpyKDg2iij" role="2Oq$k0">
-                              <ref role="3cqZAo" node="jpyKDg1A93" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN20V" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="jpyKDg2iik" role="2OqNvi">
                               <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -625,9 +625,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="jpyKDg1A93" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN20V" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="jpyKDg1A94" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN20W" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -809,7 +809,7 @@
                         <node concept="2OqwBi" id="6k10Fx5zMDn" role="3clFbG">
                           <node concept="2OqwBi" id="6k10Fx5zMDo" role="2Oq$k0">
                             <node concept="37vLTw" id="6k10Fx5zMDp" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6k10Fx5zMDs" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN20X" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6k10Fx5zMDq" role="2OqNvi">
                               <ref role="3Tt5mk" to="2c95:2TZO3DbvI5E" resolve="doc" />
@@ -821,9 +821,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6k10Fx5zMDs" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN20X" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6k10Fx5zMDt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN20Y" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -908,7 +908,7 @@
                             </node>
                             <node concept="2OqwBi" id="1lMVil77ynT" role="33vP2m">
                               <node concept="37vLTw" id="1lMVil77ynU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5yxqZJwzZ3a" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN20Z" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1lMVil77ynV" role="2OqNvi">
                                 <ref role="3Tt5mk" to="2c95:5yxqZJwzW1P" resolve="pathDef" />
@@ -953,9 +953,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5yxqZJwzZ3a" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN20Z" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5yxqZJwzZ3b" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN210" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1147,7 +1147,7 @@
                     <node concept="3clFbF" id="72XbSXENNT" role="3cqZAp">
                       <node concept="2OqwBi" id="72XbSXENNU" role="3clFbG">
                         <node concept="37vLTw" id="72XbSXENNV" role="2Oq$k0">
-                          <ref role="3cqZAo" node="72XbSXENNX" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN211" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="72XbSXENNW" role="2OqNvi">
                           <ref role="3TtcxE" to="2c95:72XbSXEIPL" resolve="authors" />
@@ -1155,9 +1155,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="72XbSXENNX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN211" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="72XbSXENNY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN212" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1534,7 +1534,7 @@
                           </node>
                           <node concept="2OqwBi" id="2TZO3DbvVyy" role="3uHU7w">
                             <node concept="37vLTw" id="2TZO3DbvVyd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2TZO3DbvVxJ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN213" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2TZO3DbvVyC" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1548,9 +1548,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="2TZO3DbvVxN" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="2TZO3DbvVxJ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN213" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2TZO3DbvVxK" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN214" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="2TZO3DbvVxM" role="1MDeny">
@@ -1638,7 +1638,7 @@
                         </node>
                         <node concept="2OqwBi" id="4vQSg$AqbVi" role="3uHU7w">
                           <node concept="37vLTw" id="4vQSg$AqbVj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4vQSg$AqbVn" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN215" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4vQSg$AqbVk" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1652,9 +1652,9 @@
                   <property role="TrG5h" value="s" />
                   <node concept="17QB3L" id="4vQSg$AqbVm" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="4vQSg$AqbVn" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN215" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4vQSg$AqbVo" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN216" role="1tU5fm" />
                 </node>
               </node>
               <node concept="Xl_RD" id="4vQSg$AqbVp" role="1MDeny">
@@ -1741,7 +1741,7 @@
                         <node concept="3clFbF" id="6uhyUqXn0mN" role="3cqZAp">
                           <node concept="2OqwBi" id="6uhyUqXn0mO" role="3clFbG">
                             <node concept="37vLTw" id="6uhyUqXn0mP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6uhyUqXn0mS" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN217" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="QRmqzHsLKQ" role="2OqNvi">
                               <ref role="37wK5l" node="QRmqzHsFzm" resolve="isInIndex" />
@@ -1749,9 +1749,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6uhyUqXn0mS" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN217" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6uhyUqXn0mT" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN218" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4093,7 +4093,7 @@
                     <node concept="3clFbF" id="519ky_So73c" role="3cqZAp">
                       <node concept="2OqwBi" id="519ky_So73y" role="3clFbG">
                         <node concept="37vLTw" id="519ky_So73d" role="2Oq$k0">
-                          <ref role="3cqZAo" node="519ky_So73a" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN219" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="519ky_So73C" role="2OqNvi">
                           <ref role="3TsBF5" to="2c95:519ky_SjvBI" resolve="isheader" />
@@ -4101,9 +4101,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="519ky_So73a" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN219" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="519ky_So73b" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN21a" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5310,7 +5310,7 @@
                               <node concept="2Ke9KJ" id="7$P_Hm3v7Dm" role="2OqNvi">
                                 <node concept="2OqwBi" id="7$P_Hm3v7NI" role="25WWJ7">
                                   <node concept="37vLTw" id="7$P_Hm3v7JY" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7$P_Hm3v1BW" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN21b" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="7$P_Hm3v80j" role="2OqNvi">
                                     <ref role="3Tt5mk" to="2c95:2TZO3DbvI5E" resolve="doc" />
@@ -5328,7 +5328,7 @@
                             <node concept="3JPx81" id="7$P_Hm3v5ya" role="2OqNvi">
                               <node concept="2OqwBi" id="7$P_Hm3v5yb" role="25WWJ7">
                                 <node concept="37vLTw" id="7$P_Hm3v5yc" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7$P_Hm3v1BW" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN21b" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7$P_Hm3v5yd" role="2OqNvi">
                                   <ref role="3Tt5mk" to="2c95:2TZO3DbvI5E" resolve="doc" />
@@ -5339,9 +5339,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7$P_Hm3v1BW" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN21b" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7$P_Hm3v1BX" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN21c" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5413,7 +5413,7 @@
                           <node concept="2OqwBi" id="5mf_X_LbzQz" role="2Oq$k0">
                             <node concept="2OqwBi" id="5mf_X_LbzQ7" role="2Oq$k0">
                               <node concept="37vLTw" id="5mf_X_LbzPM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5mf_X_LbzPJ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN21d" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5mf_X_LbzQd" role="2OqNvi">
                                 <ref role="3Tt5mk" to="2c95:5mf_X_Lbqjz" resolve="ref" />
@@ -5432,9 +5432,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5mf_X_LbzPJ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN21d" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5mf_X_LbzPK" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN21e" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5511,7 +5511,7 @@
                       <node concept="TSZUe" id="3UlEobTHU1K" role="2OqNvi">
                         <node concept="2OqwBi" id="3UlEobTHU27" role="25WWJ7">
                           <node concept="37vLTw" id="3UlEobTHU1M" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3UlEobTHU1i" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN21f" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="3UlEobTHU2d" role="2OqNvi">
                             <ref role="37wK5l" node="3UlEobTHU0G" resolve="getPath" />
@@ -5521,9 +5521,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3UlEobTHU1i" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21f" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3UlEobTHU1j" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21g" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5552,7 +5552,7 @@
                       <node concept="2OqwBi" id="3UlEobTHAWr" role="2Oq$k0">
                         <node concept="2OqwBi" id="3UlEobTHAWs" role="2Oq$k0">
                           <node concept="37vLTw" id="3UlEobTHAWt" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3UlEobTHAWy" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN21h" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3UlEobTHAWu" role="2OqNvi">
                             <ref role="3Tt5mk" to="2c95:5mf_X_Lbqjz" resolve="ref" />
@@ -5571,9 +5571,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3UlEobTHAWy" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21h" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3UlEobTHAWz" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21i" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6117,7 +6117,7 @@
                           <node concept="17QB3L" id="OI5Xv77lE6" role="1tU5fm" />
                           <node concept="2OqwBi" id="OI5Xv77lE7" role="33vP2m">
                             <node concept="37vLTw" id="OI5Xv77lE8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="OI5Xv77lEm" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN21j" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="OI5Xv77lE9" role="2OqNvi">
                               <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -6154,9 +6154,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="OI5Xv77lEm" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN21j" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="OI5Xv77lEn" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN21k" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7396,7 +7396,7 @@
                               </node>
                               <node concept="2OqwBi" id="3_8b997i6as" role="3uHU7B">
                                 <node concept="37vLTw" id="3_8b997i6at" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3_8b997i5ZT" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN21l" resolve="it" />
                                 </node>
                                 <node concept="2yIwOk" id="3_8b997i6au" role="2OqNvi" />
                               </node>
@@ -7405,9 +7405,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3_8b997i5ZT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN21l" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3_8b997i5ZU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN21m" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7418,7 +7418,7 @@
                     <node concept="3clFbF" id="6TjoDcE6_OM" role="3cqZAp">
                       <node concept="2OqwBi" id="6TjoDcE6_S1" role="3clFbG">
                         <node concept="37vLTw" id="6TjoDcE6_OL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6TjoDcE6_L9" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21n" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6TjoDcE6Ael" role="2OqNvi">
                           <ref role="37wK5l" node="6TjoDcE5T6D" resolve="shouldBeRemoved" />
@@ -7429,9 +7429,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6TjoDcE6_L9" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN21n" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6TjoDcE6_La" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN21o" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7909,7 +7909,7 @@
                     <node concept="3clFbF" id="627_yy3SRGH" role="3cqZAp">
                       <node concept="37vLTI" id="627_yy3SRGI" role="3clFbG">
                         <node concept="37vLTw" id="627_yy3SRGJ" role="37vLTx">
-                          <ref role="3cqZAo" node="627_yy3SRGP" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21p" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="627_yy3SRGK" role="37vLTJ">
                           <node concept="37vLTw" id="627_yy3SRGL" role="2Oq$k0">
@@ -7927,9 +7927,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="627_yy3SRGP" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN21p" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="627_yy3SRGQ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN21q" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8261,7 +8261,7 @@
                               <ref role="cht4Q" to="2c95:5mf_X_Lbqjw" resolve="DocumentInclude" />
                             </node>
                             <node concept="37vLTw" id="3DLpMp_s3MI" role="1m5AlR">
-                              <ref role="3cqZAo" node="2yDAfHErxED" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN21r" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -8322,7 +8322,7 @@
                     </node>
                     <node concept="2OqwBi" id="2yDAfHErylq" role="3clFbw">
                       <node concept="37vLTw" id="2yDAfHEry32" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2yDAfHErxED" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN21r" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="3DLpMp_rZig" role="2OqNvi">
                         <node concept="chp4Y" id="3DLpMp_rZoE" role="cj9EA">
@@ -8338,7 +8338,7 @@
                             <ref role="cht4Q" to="2c95:2TZO3Dbv6Ju" resolve="AbstractSection" />
                           </node>
                           <node concept="37vLTw" id="2yDAfHErE0d" role="1m5AlR">
-                            <ref role="3cqZAo" node="2yDAfHErxED" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN21r" resolve="it" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="2yDAfHErFON" role="2OqNvi">
@@ -8357,7 +8357,7 @@
                                 <ref role="cht4Q" to="2c95:2TZO3Dbv6Ju" resolve="AbstractSection" />
                               </node>
                               <node concept="37vLTw" id="2yDAfHErJtt" role="1m5AlR">
-                                <ref role="3cqZAo" node="2yDAfHErxED" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN21r" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -8415,9 +8415,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2yDAfHErxED" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21r" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2yDAfHErxEE" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21s" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/constraints.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/constraints.mps
index acd332f296b..05abb5f6ee1 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/constraints.mps
@@ -94,7 +94,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -140,12 +140,13 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="3f41734b-72c3-42c8-b22c-bacd5a878e17" name="com.mbeddr.mpsutil.propertydefault">
-      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ng" index="3_egWj">
+      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ngI" index="3_egWj">
         <child id="1550432487216060794" name="defaultValue" index="3_eitr" />
       </concept>
       <concept id="1550432487216062719" name="com.mbeddr.mpsutil.propertydefault.structure.NodePropertyConstraintDefault" flags="ng" index="3_ehVu" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -217,7 +218,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -243,7 +244,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -494,14 +494,14 @@
                                 <ref role="3cqZAo" node="5CkU_dHilZw" resolve="owningDoc" />
                               </node>
                               <node concept="37vLTw" id="5CkU_dHim4n" role="3uHU7B">
-                                <ref role="3cqZAo" node="5CkU_dHim4o" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN21t" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHim4o" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN21t" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHim4p" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN21u" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1381,7 +1381,7 @@
                               <node concept="3fqX7Q" id="5CkU_dHimgv" role="3clFbG">
                                 <node concept="2OqwBi" id="5CkU_dHimgw" role="3fr31v">
                                   <node concept="37vLTw" id="5CkU_dHimgx" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5CkU_dHimg$" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN21v" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="5CkU_dHimgy" role="2OqNvi">
                                     <node concept="chp4Y" id="5CkU_dHimgz" role="cj9EA">
@@ -1392,9 +1392,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5CkU_dHimg$" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN21v" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5CkU_dHimg_" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN21w" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps
index 934eb56e81d..a98b903b3f3 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps
@@ -662,6 +662,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -936,7 +937,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
@@ -7789,7 +7789,7 @@
                                 <node concept="2OqwBi" id="54ozzUwpEeP" role="3clFbG">
                                   <node concept="2OqwBi" id="54ozzUwpDIo" role="2Oq$k0">
                                     <node concept="37vLTw" id="54ozzUwpD_q" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="54ozzUwpDnF" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN21x" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="54ozzUwpDXM" role="2OqNvi">
                                       <ref role="3Tt5mk" to="tpc2:59ZEGVQrrtd" resolve="hint" />
@@ -7801,9 +7801,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="54ozzUwpDnF" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN21x" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="54ozzUwpDnG" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN21y" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -8046,7 +8046,7 @@
                                 <node concept="2OqwBi" id="54ozzUwpaAP" role="3clFbG">
                                   <node concept="2OqwBi" id="54ozzUwpad8" role="2Oq$k0">
                                     <node concept="37vLTw" id="54ozzUwpa48" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="54ozzUwp9PS" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN21z" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="54ozzUwpaoB" role="2OqNvi">
                                       <ref role="3Tt5mk" to="tpc2:59ZEGVQrrtd" resolve="hint" />
@@ -8058,9 +8058,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="54ozzUwp9PS" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN21z" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="54ozzUwp9PT" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN21$" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -10717,7 +10717,7 @@
                           <node concept="1pGfFk" id="6LzhH3uc_A0" role="2ShVmc">
                             <ref role="37wK5l" to="hhnx:~TextBuilderImpl.&lt;init&gt;(java.lang.String)" resolve="TextBuilderImpl" />
                             <node concept="37vLTw" id="6LzhH3uc_Ks" role="37wK5m">
-                              <ref role="3cqZAo" node="5P1DsEpLSck" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN21_" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -10725,9 +10725,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5P1DsEpLSck" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21_" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5P1DsEpLScl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21A" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12127,7 +12127,7 @@
                             <node concept="3clFbF" id="3DLpMpA_pHJ" role="3cqZAp">
                               <node concept="2OqwBi" id="3DLpMpA_pHK" role="3clFbG">
                                 <node concept="37vLTw" id="3DLpMpA_pHL" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3DLpMpA_pHN" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN21B" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="3DLpMpA_pHM" role="2OqNvi">
                                   <ref role="37wK5l" to="4gky:3DLpMp_rLmy" resolve="addToTOC" />
@@ -12135,9 +12135,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3DLpMpA_pHN" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN21B" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3DLpMpA_pHO" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN21C" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -12243,7 +12243,7 @@
                             <node concept="3clFbF" id="3DLpMp__w7g" role="3cqZAp">
                               <node concept="2OqwBi" id="3DLpMp__wsW" role="3clFbG">
                                 <node concept="37vLTw" id="3DLpMp__w7f" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3DLpMp__w78" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN21D" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="3DLpMp__wQQ" role="2OqNvi">
                                   <ref role="37wK5l" to="4gky:3DLpMp_rLmy" resolve="addToTOC" />
@@ -12251,9 +12251,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3DLpMp__w78" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN21D" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3DLpMp__w79" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN21E" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -14143,6 +14143,175 @@
       <ref role="2$4xQ3" to="r4b4:7xesQBpJXuT" resolve="presentationMode" />
     </node>
   </node>
+  <node concept="24kQdi" id="xCXNld9yc4">
+    <property role="3GE5qa" value="words.formatted" />
+    <ref role="1XX52x" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
+    <node concept="2aJ2om" id="xCXNld9yc5" role="CpUAK">
+      <ref role="2$4xQ3" to="r4b4:7xesQBpJXuT" resolve="presentationMode" />
+    </node>
+    <node concept="3EZMnI" id="xCXNld9yc6" role="2wV5jI">
+      <node concept="l2Vlx" id="xCXNld9yc7" role="2iSdaV" />
+      <node concept="3F1sOY" id="xCXNld9yc8" role="3EZMnx">
+        <ref role="34QXea" node="3DAECxFHCVq" resolve="goToURL" />
+        <ref role="1k5W1q" node="aiIotXrYWY" resolve="ref" />
+        <ref role="1NtTu8" to="2c95:xCXNldb8oL" resolve="title" />
+        <node concept="3tD6jV" id="xCXNld9yc9" role="3F10Kt">
+          <ref role="3tD7wE" to="tj7y:5A_Zlt6qyoK" resolve="hyperlink-handler" />
+          <node concept="3sjG9q" id="xCXNld9yca" role="3tD6jU">
+            <node concept="3clFbS" id="xCXNld9ycb" role="2VODD2">
+              <node concept="3cpWs8" id="xCXNld9ycc" role="3cqZAp">
+                <node concept="3cpWsn" id="xCXNld9ycd" role="3cpWs9">
+                  <property role="TrG5h" value="urLNode" />
+                  <node concept="3Tqbb2" id="xCXNld9yce" role="1tU5fm">
+                    <ref role="ehGHo" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
+                  </node>
+                  <node concept="2OqwBi" id="xCXNld9ycf" role="33vP2m">
+                    <node concept="pncrf" id="xCXNld9ycg" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="xCXNld9ych" role="2OqNvi">
+                      <node concept="1xMEDy" id="xCXNld9yci" role="1xVPHs">
+                        <node concept="chp4Y" id="xCXNld9ycj" role="ri$Ld">
+                          <ref role="cht4Q" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
+                        </node>
+                      </node>
+                      <node concept="1xIGOp" id="xCXNld9yck" role="1xVPHs" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="xCXNld9ycl" role="3cqZAp">
+                <node concept="3cpWsn" id="xCXNld9ycm" role="3cpWs9">
+                  <property role="TrG5h" value="url" />
+                  <property role="3TUv4t" value="true" />
+                  <node concept="17QB3L" id="xCXNld9ycn" role="1tU5fm" />
+                  <node concept="2OqwBi" id="xCXNldbe2l" role="33vP2m">
+                    <node concept="2OqwBi" id="xCXNld9yco" role="2Oq$k0">
+                      <node concept="37vLTw" id="xCXNld9ycp" role="2Oq$k0">
+                        <ref role="3cqZAo" node="xCXNld9ycd" resolve="urLNode" />
+                      </node>
+                      <node concept="3TrEf2" id="xCXNldbdSC" role="2OqNvi">
+                        <ref role="3Tt5mk" to="2c95:xCXNldb8b1" resolve="url" />
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="xCXNldbent" role="2OqNvi">
+                      <ref role="37wK5l" to="tbr6:3Q5enzfMT4l" resolve="asTextString" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="xCXNld9ycr" role="3cqZAp">
+                <node concept="2ShNRf" id="xCXNld9ycs" role="3clFbG">
+                  <node concept="YeOm9" id="xCXNld9yct" role="2ShVmc">
+                    <node concept="1Y3b0j" id="xCXNld9ycu" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <ref role="1Y3XeK" to="ag3p:5A_Zlt6xR6d" resolve="HyperlinkHandler" />
+                      <node concept="3Tm1VV" id="xCXNld9ycv" role="1B3o_S" />
+                      <node concept="3clFb_" id="xCXNld9ycw" role="jymVt">
+                        <property role="1EzhhJ" value="false" />
+                        <property role="TrG5h" value="open" />
+                        <node concept="3cqZAl" id="xCXNld9ycx" role="3clF45" />
+                        <node concept="3Tm1VV" id="xCXNld9ycy" role="1B3o_S" />
+                        <node concept="37vLTG" id="xCXNld9ycz" role="3clF46">
+                          <property role="TrG5h" value="util" />
+                          <node concept="3uibUv" id="xCXNld9yc$" role="1tU5fm">
+                            <ref role="3uigEE" to="ag3p:5A_Zlt6xR7j" resolve="HyperlinkUtil" />
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="xCXNld9yc_" role="3clF47">
+                          <node concept="3clFbJ" id="xCXNld9ycA" role="3cqZAp">
+                            <node concept="3clFbS" id="xCXNld9ycB" role="3clFbx">
+                              <node concept="3clFbF" id="xCXNld9ycC" role="3cqZAp">
+                                <node concept="2OqwBi" id="xCXNld9ycD" role="3clFbG">
+                                  <node concept="37vLTw" id="xCXNld9ycE" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="xCXNld9ycz" resolve="util" />
+                                  </node>
+                                  <node concept="liA8E" id="xCXNld9ycF" role="2OqNvi">
+                                    <ref role="37wK5l" to="ag3p:5A_Zlt6y20F" resolve="openInBrowser" />
+                                    <node concept="37vLTw" id="xCXNld9ycG" role="37wK5m">
+                                      <ref role="3cqZAo" node="xCXNld9ycm" resolve="url" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3y3z36" id="xCXNld9ycH" role="3clFbw">
+                              <node concept="10Nm6u" id="xCXNld9ycI" role="3uHU7w" />
+                              <node concept="37vLTw" id="xCXNld9ycJ" role="3uHU7B">
+                                <ref role="3cqZAo" node="xCXNld9ycm" resolve="url" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3tD6jV" id="xCXNld9ycK" role="3F10Kt">
+        <ref role="3tD7wE" to="tj7y:5A_Zlt6qyoK" resolve="hyperlink-handler" />
+        <node concept="3sjG9q" id="xCXNld9ycL" role="3tD6jU">
+          <node concept="3clFbS" id="xCXNld9ycM" role="2VODD2">
+            <node concept="3cpWs8" id="xCXNld9ycN" role="3cqZAp">
+              <node concept="3cpWsn" id="xCXNld9ycO" role="3cpWs9">
+                <property role="TrG5h" value="url" />
+                <property role="3TUv4t" value="true" />
+                <node concept="17QB3L" id="xCXNld9ycP" role="1tU5fm" />
+                <node concept="2OqwBi" id="xCXNld9ycQ" role="33vP2m">
+                  <node concept="pncrf" id="xCXNld9ycR" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="xCXNld9ycS" role="2OqNvi">
+                    <ref role="37wK5l" to="4gky:6byLOcR3jNg" resolve="asTextString" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="xCXNld9ycT" role="3cqZAp">
+              <node concept="2ShNRf" id="xCXNld9ycU" role="3clFbG">
+                <node concept="YeOm9" id="xCXNld9ycV" role="2ShVmc">
+                  <node concept="1Y3b0j" id="xCXNld9ycW" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <ref role="1Y3XeK" to="ag3p:5A_Zlt6xR6d" resolve="HyperlinkHandler" />
+                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                    <node concept="3Tm1VV" id="xCXNld9ycX" role="1B3o_S" />
+                    <node concept="3clFb_" id="xCXNld9ycY" role="jymVt">
+                      <property role="1EzhhJ" value="false" />
+                      <property role="TrG5h" value="open" />
+                      <node concept="3cqZAl" id="xCXNld9ycZ" role="3clF45" />
+                      <node concept="3Tm1VV" id="xCXNld9yd0" role="1B3o_S" />
+                      <node concept="37vLTG" id="xCXNld9yd1" role="3clF46">
+                        <property role="TrG5h" value="util" />
+                        <node concept="3uibUv" id="xCXNld9yd2" role="1tU5fm">
+                          <ref role="3uigEE" to="ag3p:5A_Zlt6xR7j" resolve="HyperlinkUtil" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="xCXNld9yd3" role="3clF47">
+                        <node concept="3clFbF" id="xCXNld9yd4" role="3cqZAp">
+                          <node concept="2OqwBi" id="xCXNld9yd5" role="3clFbG">
+                            <node concept="37vLTw" id="xCXNld9yd6" role="2Oq$k0">
+                              <ref role="3cqZAo" node="xCXNld9yd1" resolve="util" />
+                            </node>
+                            <node concept="liA8E" id="xCXNld9yd7" role="2OqNvi">
+                              <ref role="37wK5l" to="ag3p:5A_Zlt6y20F" resolve="openInBrowser" />
+                              <node concept="37vLTw" id="xCXNld9yd8" role="37wK5m">
+                                <ref role="3cqZAo" node="xCXNld9ycO" resolve="url" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
   <node concept="24kQdi" id="xCXNld9ybe">
     <property role="3GE5qa" value="words.formatted" />
     <ref role="1XX52x" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
@@ -14325,174 +14494,5 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="xCXNld9yc4">
-    <property role="3GE5qa" value="words.formatted" />
-    <ref role="1XX52x" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
-    <node concept="2aJ2om" id="xCXNld9yc5" role="CpUAK">
-      <ref role="2$4xQ3" to="r4b4:7xesQBpJXuT" resolve="presentationMode" />
-    </node>
-    <node concept="3EZMnI" id="xCXNld9yc6" role="2wV5jI">
-      <node concept="l2Vlx" id="xCXNld9yc7" role="2iSdaV" />
-      <node concept="3F1sOY" id="xCXNld9yc8" role="3EZMnx">
-        <ref role="34QXea" node="3DAECxFHCVq" resolve="goToURL" />
-        <ref role="1k5W1q" node="aiIotXrYWY" resolve="ref" />
-        <ref role="1NtTu8" to="2c95:xCXNldb8oL" resolve="title" />
-        <node concept="3tD6jV" id="xCXNld9yc9" role="3F10Kt">
-          <ref role="3tD7wE" to="tj7y:5A_Zlt6qyoK" resolve="hyperlink-handler" />
-          <node concept="3sjG9q" id="xCXNld9yca" role="3tD6jU">
-            <node concept="3clFbS" id="xCXNld9ycb" role="2VODD2">
-              <node concept="3cpWs8" id="xCXNld9ycc" role="3cqZAp">
-                <node concept="3cpWsn" id="xCXNld9ycd" role="3cpWs9">
-                  <property role="TrG5h" value="urLNode" />
-                  <node concept="3Tqbb2" id="xCXNld9yce" role="1tU5fm">
-                    <ref role="ehGHo" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
-                  </node>
-                  <node concept="2OqwBi" id="xCXNld9ycf" role="33vP2m">
-                    <node concept="pncrf" id="xCXNld9ycg" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="xCXNld9ych" role="2OqNvi">
-                      <node concept="1xMEDy" id="xCXNld9yci" role="1xVPHs">
-                        <node concept="chp4Y" id="xCXNld9ycj" role="ri$Ld">
-                          <ref role="cht4Q" to="2c95:xCXNld9xv2" resolve="HypertextReferenceFormattedText" />
-                        </node>
-                      </node>
-                      <node concept="1xIGOp" id="xCXNld9yck" role="1xVPHs" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="xCXNld9ycl" role="3cqZAp">
-                <node concept="3cpWsn" id="xCXNld9ycm" role="3cpWs9">
-                  <property role="TrG5h" value="url" />
-                  <property role="3TUv4t" value="true" />
-                  <node concept="17QB3L" id="xCXNld9ycn" role="1tU5fm" />
-                  <node concept="2OqwBi" id="xCXNldbe2l" role="33vP2m">
-                    <node concept="2OqwBi" id="xCXNld9yco" role="2Oq$k0">
-                      <node concept="37vLTw" id="xCXNld9ycp" role="2Oq$k0">
-                        <ref role="3cqZAo" node="xCXNld9ycd" resolve="urLNode" />
-                      </node>
-                      <node concept="3TrEf2" id="xCXNldbdSC" role="2OqNvi">
-                        <ref role="3Tt5mk" to="2c95:xCXNldb8b1" resolve="url" />
-                      </node>
-                    </node>
-                    <node concept="2qgKlT" id="xCXNldbent" role="2OqNvi">
-                      <ref role="37wK5l" to="tbr6:3Q5enzfMT4l" resolve="asTextString" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="xCXNld9ycr" role="3cqZAp">
-                <node concept="2ShNRf" id="xCXNld9ycs" role="3clFbG">
-                  <node concept="YeOm9" id="xCXNld9yct" role="2ShVmc">
-                    <node concept="1Y3b0j" id="xCXNld9ycu" role="YeSDq">
-                      <property role="2bfB8j" value="true" />
-                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                      <ref role="1Y3XeK" to="ag3p:5A_Zlt6xR6d" resolve="HyperlinkHandler" />
-                      <node concept="3Tm1VV" id="xCXNld9ycv" role="1B3o_S" />
-                      <node concept="3clFb_" id="xCXNld9ycw" role="jymVt">
-                        <property role="1EzhhJ" value="false" />
-                        <property role="TrG5h" value="open" />
-                        <node concept="3cqZAl" id="xCXNld9ycx" role="3clF45" />
-                        <node concept="3Tm1VV" id="xCXNld9ycy" role="1B3o_S" />
-                        <node concept="37vLTG" id="xCXNld9ycz" role="3clF46">
-                          <property role="TrG5h" value="util" />
-                          <node concept="3uibUv" id="xCXNld9yc$" role="1tU5fm">
-                            <ref role="3uigEE" to="ag3p:5A_Zlt6xR7j" resolve="HyperlinkUtil" />
-                          </node>
-                        </node>
-                        <node concept="3clFbS" id="xCXNld9yc_" role="3clF47">
-                          <node concept="3clFbJ" id="xCXNld9ycA" role="3cqZAp">
-                            <node concept="3clFbS" id="xCXNld9ycB" role="3clFbx">
-                              <node concept="3clFbF" id="xCXNld9ycC" role="3cqZAp">
-                                <node concept="2OqwBi" id="xCXNld9ycD" role="3clFbG">
-                                  <node concept="37vLTw" id="xCXNld9ycE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="xCXNld9ycz" resolve="util" />
-                                  </node>
-                                  <node concept="liA8E" id="xCXNld9ycF" role="2OqNvi">
-                                    <ref role="37wK5l" to="ag3p:5A_Zlt6y20F" resolve="openInBrowser" />
-                                    <node concept="37vLTw" id="xCXNld9ycG" role="37wK5m">
-                                      <ref role="3cqZAo" node="xCXNld9ycm" resolve="url" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3y3z36" id="xCXNld9ycH" role="3clFbw">
-                              <node concept="10Nm6u" id="xCXNld9ycI" role="3uHU7w" />
-                              <node concept="37vLTw" id="xCXNld9ycJ" role="3uHU7B">
-                                <ref role="3cqZAo" node="xCXNld9ycm" resolve="url" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3tD6jV" id="xCXNld9ycK" role="3F10Kt">
-        <ref role="3tD7wE" to="tj7y:5A_Zlt6qyoK" resolve="hyperlink-handler" />
-        <node concept="3sjG9q" id="xCXNld9ycL" role="3tD6jU">
-          <node concept="3clFbS" id="xCXNld9ycM" role="2VODD2">
-            <node concept="3cpWs8" id="xCXNld9ycN" role="3cqZAp">
-              <node concept="3cpWsn" id="xCXNld9ycO" role="3cpWs9">
-                <property role="TrG5h" value="url" />
-                <property role="3TUv4t" value="true" />
-                <node concept="17QB3L" id="xCXNld9ycP" role="1tU5fm" />
-                <node concept="2OqwBi" id="xCXNld9ycQ" role="33vP2m">
-                  <node concept="pncrf" id="xCXNld9ycR" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="xCXNld9ycS" role="2OqNvi">
-                    <ref role="37wK5l" to="4gky:6byLOcR3jNg" resolve="asTextString" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="xCXNld9ycT" role="3cqZAp">
-              <node concept="2ShNRf" id="xCXNld9ycU" role="3clFbG">
-                <node concept="YeOm9" id="xCXNld9ycV" role="2ShVmc">
-                  <node concept="1Y3b0j" id="xCXNld9ycW" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="1Y3XeK" to="ag3p:5A_Zlt6xR6d" resolve="HyperlinkHandler" />
-                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <node concept="3Tm1VV" id="xCXNld9ycX" role="1B3o_S" />
-                    <node concept="3clFb_" id="xCXNld9ycY" role="jymVt">
-                      <property role="1EzhhJ" value="false" />
-                      <property role="TrG5h" value="open" />
-                      <node concept="3cqZAl" id="xCXNld9ycZ" role="3clF45" />
-                      <node concept="3Tm1VV" id="xCXNld9yd0" role="1B3o_S" />
-                      <node concept="37vLTG" id="xCXNld9yd1" role="3clF46">
-                        <property role="TrG5h" value="util" />
-                        <node concept="3uibUv" id="xCXNld9yd2" role="1tU5fm">
-                          <ref role="3uigEE" to="ag3p:5A_Zlt6xR7j" resolve="HyperlinkUtil" />
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="xCXNld9yd3" role="3clF47">
-                        <node concept="3clFbF" id="xCXNld9yd4" role="3cqZAp">
-                          <node concept="2OqwBi" id="xCXNld9yd5" role="3clFbG">
-                            <node concept="37vLTw" id="xCXNld9yd6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="xCXNld9yd1" resolve="util" />
-                            </node>
-                            <node concept="liA8E" id="xCXNld9yd7" role="2OqNvi">
-                              <ref role="37wK5l" to="ag3p:5A_Zlt6y20F" resolve="openInBrowser" />
-                              <node concept="37vLTw" id="xCXNld9yd8" role="37wK5m">
-                                <ref role="3cqZAo" node="xCXNld9ycO" resolve="url" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/intentions.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/intentions.mps
index 3ea6ff81950..83015d7129d 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/intentions.mps
@@ -21,6 +21,7 @@
     <import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" />
     <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -117,7 +118,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -133,7 +134,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -148,6 +149,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -258,7 +260,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -273,7 +275,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -374,7 +375,7 @@
                   <node concept="3clFbF" id="3RseghId_9J" role="3cqZAp">
                     <node concept="2OqwBi" id="3RseghId_9K" role="3clFbG">
                       <node concept="37vLTw" id="3RseghId_9L" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3RseghId_9O" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN21F" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3RseghId_9M" role="2OqNvi">
                         <ref role="37wK5l" to="4gky:3RseghId_8J" resolve="unfoldCloseChildren" />
@@ -386,9 +387,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3RseghId_9O" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21F" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3RseghId_9P" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21G" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -477,7 +478,7 @@
                       </node>
                       <node concept="2OqwBi" id="3RseghIecXH" role="37vLTJ">
                         <node concept="37vLTw" id="3RseghIecXo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3RseghIecXl" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21H" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="3RseghIecXN" role="2OqNvi">
                           <ref role="3TsBF5" to="2c95:5yxqZJwzcbA" resolve="showImage" />
@@ -486,9 +487,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3RseghIecXl" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21H" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3RseghIecXm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21I" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -537,7 +538,7 @@
                       </node>
                       <node concept="2OqwBi" id="3RseghIecYx" role="37vLTJ">
                         <node concept="37vLTw" id="3RseghIecYy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3RseghIecY$" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21J" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="3RseghIecYz" role="2OqNvi">
                           <ref role="3TsBF5" to="2c95:5yxqZJwzcbA" resolve="showImage" />
@@ -546,9 +547,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3RseghIecY$" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21J" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3RseghIecY_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21K" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1384,8 +1385,8 @@
             </node>
             <node concept="2OqwBi" id="6g_o1CJGmc7" role="3uHU7w">
               <node concept="2YIFZM" id="6g_o1CJGjfS" role="2Oq$k0">
-                <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
-                <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+                <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                 <node concept="2OqwBi" id="6g_o1CJGlm4" role="37wK5m">
                   <node concept="2OqwBi" id="6g_o1CJGkPj" role="2Oq$k0">
                     <node concept="2OqwBi" id="6g_o1CJGkx7" role="2Oq$k0">
@@ -1615,14 +1616,14 @@
                       <ref role="37wK5l" node="4E5hYf81aIl" resolve="reflow" />
                       <ref role="1Pybhc" node="4E5hYf81aH0" resolve="TextHelper" />
                       <node concept="37vLTw" id="4E5hYf81deJ" role="37wK5m">
-                        <ref role="3cqZAo" node="4E5hYf7UiER" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN21L" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4E5hYf7UiER" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21L" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4E5hYf7UiES" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21M" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1668,7 +1669,7 @@
                       <node concept="2OqwBi" id="4E5hYf81aL8" role="3clFbG">
                         <node concept="2OqwBi" id="4E5hYf81aL9" role="2Oq$k0">
                           <node concept="37vLTw" id="4E5hYf81aLa" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4E5hYf81aLe" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN21N" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4E5hYf81aLb" role="2OqNvi">
                             <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -1683,9 +1684,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4E5hYf81aLe" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN21N" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4E5hYf81aLf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN21O" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1699,7 +1700,7 @@
                       <node concept="17QB3L" id="4E5hYf81aLl" role="1tU5fm" />
                       <node concept="2OqwBi" id="4E5hYf81aLm" role="33vP2m">
                         <node concept="37vLTw" id="4E5hYf81aLn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4E5hYf81aLA" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21P" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="4E5hYf81aLo" role="2OqNvi">
                           <ref role="37wK5l" to="tbr6:ehGfXvI_DB" resolve="getText" />
@@ -1731,7 +1732,7 @@
                   <node concept="3clFbF" id="4E5hYf81aLx" role="3cqZAp">
                     <node concept="2OqwBi" id="4E5hYf81aLy" role="3clFbG">
                       <node concept="37vLTw" id="4E5hYf81aLz" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4E5hYf81aLA" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN21P" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4E5hYf81aL$" role="2OqNvi">
                         <ref role="37wK5l" to="tbr6:1JwC6U7zkKz" resolve="setText" />
@@ -1742,9 +1743,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4E5hYf81aLA" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21P" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4E5hYf81aLB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21Q" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2269,14 +2270,14 @@
                       <node concept="3y3z36" id="1ig5EljkfCY" role="3clFbG">
                         <node concept="2Sf5sV" id="1ig5EljkMX4" role="3uHU7w" />
                         <node concept="37vLTw" id="1ig5EljkeTJ" role="3uHU7B">
-                          <ref role="3cqZAo" node="1ig5Eljkdxr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21R" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1ig5Eljkdxr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN21R" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1ig5Eljkdxs" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN21S" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2304,7 +2305,7 @@
                   <node concept="3clFbF" id="1ig5Eljkmme" role="3cqZAp">
                     <node concept="37vLTI" id="1ig5EljksnM" role="3clFbG">
                       <node concept="37vLTw" id="1ig5Eljksr9" role="37vLTx">
-                        <ref role="3cqZAo" node="1ig5Eljkmel" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN21T" resolve="it" />
                       </node>
                       <node concept="2OqwBi" id="1ig5EljkrJC" role="37vLTJ">
                         <node concept="37vLTw" id="1ig5Eljkrrn" role="2Oq$k0">
@@ -2317,9 +2318,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1ig5Eljkmel" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21T" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1ig5Eljkmem" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21U" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2585,15 +2586,15 @@
                       <node concept="2qgKlT" id="4IT6unQVER" role="2OqNvi">
                         <ref role="37wK5l" to="4gky:519ky_SnQ7F" resolve="addWord" />
                         <node concept="37vLTw" id="4IT6unQVJl" role="37wK5m">
-                          <ref role="3cqZAo" node="4IT6unQUER" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21V" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4IT6unQUER" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN21V" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4IT6unQUES" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN21W" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/migration.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/migration.mps
index 011c1106656..e51179bfd84 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -71,7 +71,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -81,7 +81,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -93,6 +93,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -170,7 +171,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -184,7 +185,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -252,7 +252,7 @@
                           <node concept="2OqwBi" id="32cJsh9$6Ym" role="3clFbG">
                             <node concept="2OqwBi" id="32cJsh9$5Ef" role="2Oq$k0">
                               <node concept="37vLTw" id="32cJsh9$5ox" role="2Oq$k0">
-                                <ref role="3cqZAo" node="32cJsh9$5hd" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN22d" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="32cJsh9$6po" role="2OqNvi">
                                 <ref role="3Tt5mk" to="2c95:5JlMPDXOsfV" resolve="defaultImagePath" />
@@ -262,9 +262,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="32cJsh9$5hd" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN22d" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="32cJsh9$5he" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN22e" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -276,7 +276,7 @@
                         <node concept="2OqwBi" id="32cJsh9$bdh" role="3clFbG">
                           <node concept="2OqwBi" id="32cJsh9$9MX" role="2Oq$k0">
                             <node concept="37vLTw" id="32cJsh9$96s" role="2Oq$k0">
-                              <ref role="3cqZAo" node="32cJsh9$91q" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22f" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="32cJsh9$aDB" role="2OqNvi">
                               <ref role="3Tt5mk" to="2c95:5JlMPDXOsfV" resolve="defaultImagePath" />
@@ -286,9 +286,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="32cJsh9$91q" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN22f" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="32cJsh9$91r" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN22g" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -373,7 +373,7 @@
                           <node concept="10Nm6u" id="1xGVIWdDFqc" role="37vLTx" />
                           <node concept="2OqwBi" id="1xGVIWdDB69" role="37vLTJ">
                             <node concept="37vLTw" id="1xGVIWdDAPB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1xGVIWdDAJQ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22h" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1xGVIWdDCah" role="2OqNvi">
                               <ref role="3Tt5mk" to="2c95:627_yy34G1c" resolve="path" />
@@ -382,9 +382,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1xGVIWdDAJQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN22h" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1xGVIWdDAJR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN22i" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -483,7 +483,7 @@
                           </node>
                           <node concept="2OqwBi" id="3WqLVgfJYTT" role="33vP2m">
                             <node concept="37vLTw" id="3WqLVgfJYTU" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3WqLVgfGltB" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22j" resolve="it" />
                             </node>
                             <node concept="1P9Npp" id="3WqLVgfJYTV" role="2OqNvi">
                               <node concept="2pJPEk" id="3WqLVgfJYTW" role="1P9ThW">
@@ -494,7 +494,7 @@
                                     <node concept="36biLy" id="3WqLVgfJYTZ" role="28nt2d">
                                       <node concept="2OqwBi" id="3WqLVgfJYU0" role="36biLW">
                                         <node concept="37vLTw" id="3WqLVgfJYU1" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3WqLVgfGltB" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN22j" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="3WqLVgfJYU2" role="2OqNvi">
                                           <ref role="3Tt5mk" to="2c95:2iGZqsHuOq2" resolve="pathPicker" />
@@ -514,7 +514,7 @@
                             <node concept="37vLTI" id="3WqLVgfK3FE" role="3clFbG">
                               <node concept="2OqwBi" id="3WqLVgfK42f" role="37vLTx">
                                 <node concept="37vLTw" id="3WqLVgfK3O0" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3WqLVgfGltB" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN22j" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="3WqLVgfK4sg" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -534,7 +534,7 @@
                         <node concept="2OqwBi" id="3WqLVgfK0Jx" role="3clFbw">
                           <node concept="2OqwBi" id="3WqLVgfJZIR" role="2Oq$k0">
                             <node concept="37vLTw" id="3WqLVgfJZx2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3WqLVgfGltB" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22j" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3WqLVgfK06e" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -544,9 +544,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3WqLVgfGltB" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN22j" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3WqLVgfGltC" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN22k" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -635,7 +635,7 @@
                           <node concept="2OqwBi" id="7mK357ywaRp" role="3clFbG">
                             <node concept="2OqwBi" id="7mK357yw9S5" role="2Oq$k0">
                               <node concept="37vLTw" id="7mK357yw9$g" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7mK357yw9sd" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN22l" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="7mK357ywahy" role="2OqNvi">
                                 <ref role="3Tt5mk" to="2c95:66AQhBxN1Tt" resolve="identity_old" />
@@ -645,9 +645,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7mK357yw9sd" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN22l" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7mK357yw9se" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN22m" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -659,7 +659,7 @@
                         <node concept="37vLTI" id="7mK357ywcQQ" role="3clFbG">
                           <node concept="2OqwBi" id="7mK357ywcp1" role="37vLTJ">
                             <node concept="37vLTw" id="7mK357ywc7A" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7mK357ywbXO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22n" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7mK357ywcyx" role="2OqNvi">
                               <ref role="3Tt5mk" to="2c95:7mK357ypJVJ" resolve="identity" />
@@ -673,14 +673,14 @@
                               <ref role="37wK5l" to="xlb7:1Bs_61$mIAC" resolve="create" />
                               <node concept="2OqwBi" id="7mK357ywhYY" role="37wK5m">
                                 <node concept="37vLTw" id="7mK357ywhEq" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7mK357ywbXO" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN22n" resolve="it" />
                                 </node>
                                 <node concept="I4A8Y" id="7mK357ywisc" role="2OqNvi" />
                               </node>
                               <node concept="2OqwBi" id="7mK357ywk2u" role="37wK5m">
                                 <node concept="2OqwBi" id="7mK357ywjem" role="2Oq$k0">
                                   <node concept="37vLTw" id="7mK357ywiT$" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7mK357ywbXO" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN22n" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="7mK357ywjHJ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="2c95:66AQhBxN1Tt" resolve="identity_old" />
@@ -698,7 +698,7 @@
                         <node concept="2OqwBi" id="7mK357ywm37" role="3clFbG">
                           <node concept="2OqwBi" id="7mK357ywl1v" role="2Oq$k0">
                             <node concept="37vLTw" id="7mK357ywkMr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7mK357ywbXO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN22n" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7mK357ywlK1" role="2OqNvi">
                               <ref role="3Tt5mk" to="2c95:66AQhBxN1Tt" resolve="identity_old" />
@@ -708,9 +708,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7mK357ywbXO" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN22n" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7mK357ywbXP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN22o" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
index a3db43199d1..08092b64eda 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
@@ -2,9 +2,9 @@
 <model ref="r:07597124-beb3-41b7-beb1-a882af3ded40(com.mbeddr.doc.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="-1" />
@@ -86,6 +86,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -108,7 +109,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -248,7 +249,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -277,7 +278,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1170075670744" name="jetbrains.mps.baseLanguage.structure.SynchronizedStatement" flags="nn" index="1HWtB8">
@@ -314,6 +315,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -353,7 +355,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -446,7 +448,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -496,7 +498,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -525,6 +526,7 @@
   <node concept="sE7Ow" id="41AlOFgBPyg">
     <property role="TrG5h" value="UpdateAllCodeTexts" />
     <property role="2uzpH1" value="Update All Code Texts" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="41AlOFgBPyh" role="tncku">
       <node concept="3clFbS" id="41AlOFgBPyi" role="2VODD2">
         <node concept="3clFbF" id="41AlOFgC9m_" role="3cqZAp">
@@ -559,7 +561,7 @@
                       <node concept="2OqwBi" id="5_sZ3baTbIT" role="33vP2m">
                         <node concept="2JrnkZ" id="5_sZ3baTbIU" role="2Oq$k0">
                           <node concept="37vLTw" id="5_sZ3baTbIV" role="2JrQYb">
-                            <ref role="3cqZAo" node="41AlOFgCd_g" resolve="modl" />
+                            <ref role="3cqZAo" node="2SR9xrsN22r" resolve="modl" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5_sZ3baTbIW" role="2OqNvi">
@@ -572,7 +574,7 @@
                     <node concept="2OqwBi" id="41AlOFgCfAn" role="3clFbG">
                       <node concept="2OqwBi" id="41AlOFgCdSn" role="2Oq$k0">
                         <node concept="37vLTw" id="41AlOFgCdLq" role="2Oq$k0">
-                          <ref role="3cqZAo" node="41AlOFgCd_g" resolve="modl" />
+                          <ref role="3cqZAo" node="2SR9xrsN22r" resolve="modl" />
                         </node>
                         <node concept="2SmgA7" id="41AlOFgCeba" role="2OqNvi">
                           <node concept="chp4Y" id="12zeRDvnbhn" role="1dBWTz">
@@ -589,7 +591,7 @@
                                 <node concept="10P_77" id="QRmqzKa07s" role="1tU5fm" />
                                 <node concept="2OqwBi" id="QRmqzKa1zP" role="33vP2m">
                                   <node concept="37vLTw" id="QRmqzKa1fm" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="41AlOFgCrRS" resolve="codeParagraph" />
+                                    <ref role="3cqZAo" node="2SR9xrsN22p" resolve="codeParagraph" />
                                   </node>
                                   <node concept="3TrcHB" id="QRmqzKa2R3" role="2OqNvi">
                                     <ref role="3TsBF5" to="2c95:627_yy34G17" resolve="showContents" />
@@ -606,7 +608,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="QRmqzKa3ya" role="37vLTJ">
                                       <node concept="37vLTw" id="QRmqzKa3ew" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="41AlOFgCrRS" resolve="codeParagraph" />
+                                        <ref role="3cqZAo" node="2SR9xrsN22p" resolve="codeParagraph" />
                                       </node>
                                       <node concept="3TrcHB" id="QRmqzKa4Lz" role="2OqNvi">
                                         <ref role="3TsBF5" to="2c95:627_yy34G17" resolve="showContents" />
@@ -620,7 +622,7 @@
                                       <ref role="37wK5l" to="hwgx:5_sZ3ba$LLe" resolve="getTextForNodeInSwingContext" />
                                       <ref role="1Pybhc" to="hwgx:1yFmGPnITl_" resolve="FakeEditorComponent" />
                                       <node concept="37vLTw" id="5_sZ3baBjfo" role="37wK5m">
-                                        <ref role="3cqZAo" node="41AlOFgCrRS" resolve="codeParagraph" />
+                                        <ref role="3cqZAo" node="2SR9xrsN22p" resolve="codeParagraph" />
                                       </node>
                                       <node concept="37vLTw" id="5_sZ3baTbIX" role="37wK5m">
                                         <ref role="3cqZAo" node="5_sZ3baTbIS" resolve="repository" />
@@ -628,7 +630,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="41AlOFgCshK" role="37vLTJ">
                                       <node concept="37vLTw" id="41AlOFgCs5L" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="41AlOFgCrRS" resolve="codeParagraph" />
+                                        <ref role="3cqZAo" node="2SR9xrsN22p" resolve="codeParagraph" />
                                       </node>
                                       <node concept="3TrcHB" id="41AlOFgCsXN" role="2OqNvi">
                                         <ref role="3TsBF5" to="2c95:627_yy34G1j" resolve="text" />
@@ -646,7 +648,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="QRmqzKa6XX" role="37vLTJ">
                                         <node concept="37vLTw" id="QRmqzKa6En" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="41AlOFgCrRS" resolve="codeParagraph" />
+                                          <ref role="3cqZAo" node="2SR9xrsN22p" resolve="codeParagraph" />
                                         </node>
                                         <node concept="3TrcHB" id="QRmqzKa8di" role="2OqNvi">
                                           <ref role="3TsBF5" to="2c95:627_yy34G17" resolve="showContents" />
@@ -658,18 +660,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="41AlOFgCrRS" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN22p" role="1bW2Oz">
                             <property role="TrG5h" value="codeParagraph" />
-                            <node concept="2jxLKc" id="41AlOFgCrRT" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN22q" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="41AlOFgCd_g" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN22r" role="1bW2Oz">
                   <property role="TrG5h" value="modl" />
-                  <node concept="2jxLKc" id="41AlOFgCd_h" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN22s" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -728,7 +730,7 @@
                     <node concept="3clFbF" id="5_sZ3bazYtf" role="3cqZAp">
                       <node concept="2OqwBi" id="5_sZ3bazYEz" role="3clFbG">
                         <node concept="37vLTw" id="5_sZ3bazYte" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5_sZ3bazY8D" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN22t" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5_sZ3ba$50X" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
@@ -736,9 +738,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5_sZ3bazY8D" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN22t" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5_sZ3bazY8E" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN22u" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1174,7 +1176,7 @@
                                         <node concept="10QFUN" id="49PUF$HQbt5" role="1eOMHV">
                                           <node concept="2OqwBi" id="49PUF$HQbt2" role="10QFUP">
                                             <node concept="37vLTw" id="49PUF$HQbt3" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="49PUF$HQ6Cu" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN22v" resolve="it" />
                                             </node>
                                             <node concept="liA8E" id="49PUF$HQbt4" role="2OqNvi">
                                               <ref role="37wK5l" to="ao3:~TextUnit.getStartNode()" resolve="getStartNode" />
@@ -1193,9 +1195,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="49PUF$HQ6Cu" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN22v" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="49PUF$HQ6Cv" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN22w" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1409,7 +1411,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="271UTRKO8aP" role="2Oq$k0">
                                                 <node concept="37vLTw" id="271UTRKPBdv" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="271UTRKXUlS" resolve="config" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN22x" resolve="config" />
                                                 </node>
                                                 <node concept="3TrEf2" id="271UTRKO8Ah" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="2c95:5JlMPDXOsfV" resolve="defaultImagePath" />
@@ -1440,7 +1442,7 @@
                                               <node concept="2OqwBi" id="271UTRKX29j" role="2Oq$k0">
                                                 <node concept="2OqwBi" id="271UTRKX29k" role="2Oq$k0">
                                                   <node concept="37vLTw" id="271UTRKX29l" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="271UTRKXUlS" resolve="config" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN22x" resolve="config" />
                                                   </node>
                                                   <node concept="3TrEf2" id="271UTRKX29m" role="2OqNvi">
                                                     <ref role="3Tt5mk" to="2c95:5JlMPDXOsfV" resolve="defaultImagePath" />
@@ -1515,7 +1517,7 @@
                                         <node concept="2OqwBi" id="271UTRKWxqe" role="2Oq$k0">
                                           <node concept="2OqwBi" id="271UTRKWuXA" role="2Oq$k0">
                                             <node concept="37vLTw" id="271UTRKWuoK" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="271UTRKXUlS" resolve="config" />
+                                              <ref role="3cqZAo" node="2SR9xrsN22x" resolve="config" />
                                             </node>
                                             <node concept="3TrEf2" id="271UTRKWvRp" role="2OqNvi">
                                               <ref role="3Tt5mk" to="2c95:5JlMPDXOsfV" resolve="defaultImagePath" />
@@ -1534,7 +1536,7 @@
                                     <node concept="2OqwBi" id="271UTRKRKmE" role="3uHU7B">
                                       <node concept="2OqwBi" id="271UTRKRIvC" role="2Oq$k0">
                                         <node concept="37vLTw" id="271UTRKRHYk" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="271UTRKXUlS" resolve="config" />
+                                          <ref role="3cqZAo" node="2SR9xrsN22x" resolve="config" />
                                         </node>
                                         <node concept="3TrEf2" id="271UTRKRJlI" role="2OqNvi">
                                           <ref role="3Tt5mk" to="2c95:5JlMPDXOsfV" resolve="defaultImagePath" />
@@ -1549,9 +1551,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="271UTRKXUlS" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN22x" role="1bW2Oz">
                                 <property role="TrG5h" value="config" />
-                                <node concept="2jxLKc" id="271UTRKXUlT" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN22y" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2436,7 +2438,7 @@
                                         <node concept="2OqwBi" id="TDp769cJuj" role="3uHU7B">
                                           <node concept="2OqwBi" id="TDp769cHhH" role="2Oq$k0">
                                             <node concept="37vLTw" id="TDp769cGpm" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4g8ToP3X6Rv" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN22z" resolve="it" />
                                             </node>
                                             <node concept="2sxana" id="TDp769cI_R" role="2OqNvi">
                                               <ref role="2sxfKC" to="fn29:1Xl3kQ1uadG" resolve="status" />
@@ -2453,7 +2455,7 @@
                                           <ref role="37wK5l" to="w1kc:~SModelOperations.getOutputLocation(org.jetbrains.mps.openapi.model.SModel)" resolve="getOutputLocation" />
                                           <node concept="2OqwBi" id="5gvmGjUs1AC" role="37wK5m">
                                             <node concept="37vLTw" id="5gvmGjUs1AD" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4g8ToP3X6Rv" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN22z" resolve="it" />
                                             </node>
                                             <node concept="2sxana" id="5gvmGjUs1AE" role="2OqNvi">
                                               <ref role="2sxfKC" to="fn29:1Xl3kQ1uadB" resolve="model" />
@@ -2465,9 +2467,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4g8ToP3X6Rv" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN22z" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4g8ToP3X6Rw" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN22$" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2496,7 +2498,7 @@
                                       <node concept="H_c77" id="x$_sKCq8qX" role="1tU5fm" />
                                       <node concept="2OqwBi" id="x$_sKCq8qY" role="33vP2m">
                                         <node concept="37vLTw" id="x$_sKCq8qZ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="x$_sKCq8rd" resolve="gResource" />
+                                          <ref role="3cqZAo" node="2SR9xrsN22B" resolve="gResource" />
                                         </node>
                                         <node concept="2sxana" id="x$_sKCq8r0" role="2OqNvi">
                                           <ref role="2sxfKC" to="fn29:1Xl3kQ1uadB" resolve="model" />
@@ -2515,7 +2517,7 @@
                                       <node concept="2OqwBi" id="x$_sKCq8r4" role="33vP2m">
                                         <node concept="2OqwBi" id="x$_sKCq8r5" role="2Oq$k0">
                                           <node concept="37vLTw" id="x$_sKCq8r6" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="x$_sKCq8rd" resolve="gResource" />
+                                            <ref role="3cqZAo" node="2SR9xrsN22B" resolve="gResource" />
                                           </node>
                                           <node concept="2sxana" id="x$_sKCq8r7" role="2OqNvi">
                                             <ref role="2sxfKC" to="fn29:1Xl3kQ1uadG" resolve="status" />
@@ -2541,23 +2543,23 @@
                                                   <ref role="3cqZAo" node="x$_sKCq8qW" resolve="inputModel" />
                                                 </node>
                                                 <node concept="37vLTw" id="x$_sKCqm9k" role="1Lso8e">
-                                                  <ref role="3cqZAo" node="x$_sKCqgI6" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN22_" resolve="it" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="x$_sKCqgI6" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN22_" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="x$_sKCqgI7" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN22A" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="x$_sKCq8rd" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN22B" role="1bW2Oz">
                                   <property role="TrG5h" value="gResource" />
-                                  <node concept="2jxLKc" id="x$_sKCq8re" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN22C" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3050,7 +3052,7 @@
                                               <node concept="2OqwBi" id="5XfUTkOqCHp" role="3clFbG">
                                                 <node concept="2OqwBi" id="5XfUTkOqCHq" role="2Oq$k0">
                                                   <node concept="37vLTw" id="5XfUTkOqCHr" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="5XfUTkOqCHu" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN22D" resolve="it" />
                                                   </node>
                                                   <node concept="3TrEf2" id="5XfUTkOqCHs" role="2OqNvi">
                                                     <ref role="3Tt5mk" to="tpc2:59ZEGVQrrtd" resolve="hint" />
@@ -3062,9 +3064,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="5XfUTkOqCHu" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN22D" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="5XfUTkOqCHv" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN22E" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -3274,7 +3276,7 @@
                                                 <node concept="2OqwBi" id="5XfUTkOqSlD" role="3clFbG">
                                                   <node concept="2OqwBi" id="5XfUTkOqQNo" role="2Oq$k0">
                                                     <node concept="37vLTw" id="5XfUTkOqQ5t" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="5XfUTkOqPbs" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN22F" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="5XfUTkOqRA7" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="tpc2:59ZEGVQrrtd" resolve="hint" />
@@ -3286,9 +3288,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="5XfUTkOqPbs" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN22F" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="5XfUTkOqPbt" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN22G" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/typesystem.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/typesystem.mps
index 3be9bcb7e8d..4f62a238afb 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/typesystem.mps
@@ -79,7 +79,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,6 +95,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -219,7 +220,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -250,7 +251,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -270,6 +270,19 @@
     <property role="3GE5qa" value="paragraphs" />
     <node concept="3clFbS" id="5yxqZJwzj0r" role="18ibNy">
       <node concept="3clFbJ" id="5yxqZJwzj0t" role="3cqZAp">
+        <node concept="3clFbS" id="5yxqZJwzj0v" role="3clFbx">
+          <node concept="2MkqsV" id="5yxqZJwzj12" role="3cqZAp">
+            <node concept="Xl_RD" id="5yxqZJwzj15" role="2MkJ7o">
+              <property role="Xl_RC" value="no valid image specified" />
+            </node>
+            <node concept="1YBJjd" id="5yxqZJwzj16" role="1urrMF">
+              <ref role="1YBMHb" node="5yxqZJwzj0s" resolve="ip" />
+            </node>
+            <node concept="2ODE4t" id="5yxqZJwzj19" role="1urrC5">
+              <ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
+            </node>
+          </node>
+        </node>
         <node concept="1Wc70l" id="44D1kY$xWRV" role="3clFbw">
           <node concept="3fqX7Q" id="44D1kY$xYm$" role="3uHU7B">
             <node concept="2YIFZM" id="44D1kY$xYmA" role="3fr31v">
@@ -294,19 +307,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbS" id="5yxqZJwzj0v" role="3clFbx">
-          <node concept="2MkqsV" id="5yxqZJwzj12" role="3cqZAp">
-            <node concept="Xl_RD" id="5yxqZJwzj15" role="2MkJ7o">
-              <property role="Xl_RC" value="no valid image specified" />
-            </node>
-            <node concept="1YBJjd" id="5yxqZJwzj16" role="1urrMF">
-              <ref role="1YBMHb" node="5yxqZJwzj0s" resolve="ip" />
-            </node>
-            <node concept="2ODE4t" id="5yxqZJwzj19" role="1urrC5">
-              <ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="1YaCAy" id="5yxqZJwzj0s" role="1YuTPh">
@@ -455,7 +455,7 @@
                     <node concept="3clFbF" id="2i$odZBB9J1" role="3cqZAp">
                       <node concept="2OqwBi" id="2i$odZBBa6i" role="3clFbG">
                         <node concept="37vLTw" id="2i$odZBB9J0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2i$odZBB9Dg" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN21X" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2i$odZBBaPu" role="2OqNvi">
                           <ref role="37wK5l" to="4gky:2i$odZBB7La" resolve="needsMapping" />
@@ -463,9 +463,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2i$odZBB9Dg" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN21X" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2i$odZBB9Dh" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN21Y" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -492,7 +492,7 @@
                               </node>
                               <node concept="2OqwBi" id="3UlEobTHJUL" role="3uHU7B">
                                 <node concept="37vLTw" id="3UlEobTHJUs" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3UlEobTHJUp" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN21Z" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3UlEobTHJVm" role="2OqNvi">
                                   <ref role="3Tt5mk" to="2c95:5yxqZJwzW1P" resolve="pathDef" />
@@ -501,9 +501,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3UlEobTHJUp" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN21Z" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3UlEobTHJUq" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN220" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -616,7 +616,7 @@
                           </node>
                           <node concept="2OqwBi" id="3RseghIeKCN" role="3uHU7B">
                             <node concept="37vLTw" id="3RseghIeKCO" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3RseghIeKCQ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN221" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3RseghIeKCP" role="2OqNvi">
                               <ref role="3Tt5mk" to="2c95:3RseghIeCP5" resolve="arg" />
@@ -625,9 +625,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3RseghIeKCQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN221" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3RseghIeKCR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN222" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -794,6 +794,16 @@
     <property role="3GE5qa" value="table" />
     <node concept="3clFbS" id="519ky_Sk7HI" role="18ibNy">
       <node concept="3clFbJ" id="519ky_Sk7HK" role="3cqZAp">
+        <node concept="3clFbS" id="519ky_Sk7HM" role="3clFbx">
+          <node concept="2MkqsV" id="519ky_Sk7Kl" role="3cqZAp">
+            <node concept="Xl_RD" id="519ky_Sk7Ko" role="2MkJ7o">
+              <property role="Xl_RC" value="wrong number of cells" />
+            </node>
+            <node concept="1YBJjd" id="519ky_Sk7Kr" role="1urrMF">
+              <ref role="1YBMHb" node="519ky_Sk7HJ" resolve="tr" />
+            </node>
+          </node>
+        </node>
         <node concept="1Wc70l" id="5g63V59$w9J" role="3clFbw">
           <node concept="2OqwBi" id="5g63V59$yfb" role="3uHU7w">
             <node concept="2OqwBi" id="5g63V59$wnN" role="2Oq$k0">
@@ -837,16 +847,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbS" id="519ky_Sk7HM" role="3clFbx">
-          <node concept="2MkqsV" id="519ky_Sk7Kl" role="3cqZAp">
-            <node concept="Xl_RD" id="519ky_Sk7Ko" role="2MkJ7o">
-              <property role="Xl_RC" value="wrong number of cells" />
-            </node>
-            <node concept="1YBJjd" id="519ky_Sk7Kr" role="1urrMF">
-              <ref role="1YBMHb" node="519ky_Sk7HJ" resolve="tr" />
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="1YaCAy" id="519ky_Sk7HJ" role="1YuTPh">
@@ -1233,7 +1233,7 @@
                     <node concept="3clFbF" id="8QSRaj_ZBY" role="3cqZAp">
                       <node concept="2OqwBi" id="8QSRaj_ZBZ" role="3clFbG">
                         <node concept="37vLTw" id="8QSRaj_ZC0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="8QSRaj_ZC3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN223" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="8QSRaj_ZC1" role="2OqNvi">
                           <node concept="1xIGOp" id="8QSRaj_ZC2" role="1xVPHs" />
@@ -1241,9 +1241,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="8QSRaj_ZC3" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN223" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="8QSRaj_ZC4" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN224" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1255,7 +1255,7 @@
                     <node concept="2OqwBi" id="8QSRaj_ZC9" role="3clFbG">
                       <node concept="2OqwBi" id="8QSRaj_ZCa" role="2Oq$k0">
                         <node concept="37vLTw" id="8QSRaj_ZCb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="8QSRaj_ZCm" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN227" resolve="it" />
                         </node>
                         <node concept="2z74zc" id="8QSRaj_ZCc" role="2OqNvi" />
                       </node>
@@ -1266,7 +1266,7 @@
                               <node concept="2OqwBi" id="8QSRajCXPt" role="3clFbG">
                                 <node concept="2OqwBi" id="8QSRaj_ZCh" role="2Oq$k0">
                                   <node concept="37vLTw" id="8QSRaj_ZCi" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="8QSRaj_ZCk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN225" resolve="it" />
                                   </node>
                                   <node concept="2ZHEkA" id="8QSRaj_ZCj" role="2OqNvi" />
                                 </node>
@@ -1274,18 +1274,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="8QSRaj_ZCk" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN225" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="8QSRaj_ZCl" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN226" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="8QSRaj_ZCm" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN227" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="8QSRaj_ZCn" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN228" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1321,14 +1321,14 @@
                           <ref role="1YBMHb" node="8QSRaj$uI6" resolve="iDocumentLike" />
                         </node>
                         <node concept="37vLTw" id="8QSRajA2Wr" role="3uHU7B">
-                          <ref role="3cqZAo" node="8QSRajA2$P" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN229" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="8QSRajA2$P" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN229" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="8QSRajA2$Q" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN22a" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1358,7 +1358,7 @@
                         <property role="Xl_RC" value="Superfluous depends: Dependent document is not used" />
                       </node>
                       <node concept="37vLTw" id="8QSRajA67Z" role="1urrMF">
-                        <ref role="3cqZAo" node="8QSRaj_XhB" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN22b" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -1370,7 +1370,7 @@
                       <node concept="3JPx81" id="8QSRajA5Mq" role="2OqNvi">
                         <node concept="2OqwBi" id="8QSRajA5Mr" role="25WWJ7">
                           <node concept="37vLTw" id="8QSRajA5Ms" role="2Oq$k0">
-                            <ref role="3cqZAo" node="8QSRaj_XhB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN22b" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="8QSRajA5Mt" role="2OqNvi">
                             <ref role="3Tt5mk" to="2c95:2TZO3DbvI5E" resolve="doc" />
@@ -1381,9 +1381,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="8QSRaj_XhB" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN22b" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="8QSRaj_XhC" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN22c" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd
index b852f4d73a6..6b370f821b0 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.pluginSolution" uuid="0201165a-4644-499f-ae6a-3d55a8488d23" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.doc.pluginSolution" uuid="0201165a-4644-499f-ae6a-3d55a8488d23" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)</dependency>
@@ -27,7 +26,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -45,7 +44,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps
index 085ff053634..1da3e10e78f 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -34,6 +34,7 @@
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" implicit="true" />
     <import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" implicit="true" />
+    <import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" implicit="true" />
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" implicit="true" />
   </imports>
   <registry>
@@ -43,6 +44,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <property id="1213273179528" name="description" index="1WHSii" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
@@ -83,7 +85,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -105,7 +107,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -134,10 +136,6 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
-      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
-        <child id="1081256993305" name="classType" index="2ZW6by" />
-        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
-      </concept>
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
@@ -210,10 +208,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -238,7 +233,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -261,7 +256,6 @@
         <child id="1163670677455" name="expression" index="3Kbmr1" />
         <child id="1163670683720" name="body" index="3Kbo56" />
       </concept>
-      <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
@@ -272,6 +266,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -281,7 +276,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -311,10 +306,14 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
+        <child id="1204834868751" name="expression" index="25KhWn" />
+      </concept>
       <concept id="3506770386464365589" name="jetbrains.mps.lang.smodel.structure.Model_PointerOperation" flags="ng" index="aIX43" />
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -323,6 +322,9 @@
       <concept id="1761385620274348152" name="jetbrains.mps.lang.smodel.structure.SConceptTypeCastExpression" flags="nn" index="2CBFar" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
+      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
+        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
+      </concept>
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -340,7 +342,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -368,7 +370,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -388,6 +389,7 @@
     <property role="TrG5h" value="createExportSkeleton" />
     <property role="2uzpH1" value="Create Document Export" />
     <property role="3GE5qa" value="wizards" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="78Ts1skpdx3" role="tncku">
       <node concept="3clFbS" id="78Ts1skpdx4" role="2VODD2">
         <node concept="3clFbH" id="78Ts1skpiUv" role="3cqZAp" />
@@ -1354,6 +1356,7 @@
     <property role="TrG5h" value="WordsViewerAction" />
     <property role="2uzpH1" value="Comment Tags ..." />
     <property role="1WHSii" value="Comment Tags" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="l3$K9zT0GY" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -1723,15 +1726,15 @@
                                   <node concept="1pGfFk" id="6HWKDNEIaGV" role="2ShVmc">
                                     <ref role="37wK5l" node="6HWKDNEDKqp" resolve="WordsViewer.Entry" />
                                     <node concept="37vLTw" id="6HWKDNEIaGW" role="37wK5m">
-                                      <ref role="3cqZAo" node="6HWKDNEIaGX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2AA" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6HWKDNEIaGX" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2AA" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6HWKDNEIaGY" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2AB" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1742,7 +1745,7 @@
                             <node concept="3clFbF" id="6HWKDNEJmup" role="3cqZAp">
                               <node concept="2OqwBi" id="6HWKDNEJmZR" role="3clFbG">
                                 <node concept="37vLTw" id="6HWKDNEJmuo" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6HWKDNEJlkA" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2AC" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="6HWKDNEJuAT" role="2OqNvi">
                                   <ref role="37wK5l" node="6HWKDNEDLT5" resolve="toString" />
@@ -1750,9 +1753,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6HWKDNEJlkA" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2AC" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6HWKDNEJlkB" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2AD" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="1nlBCl" id="6HWKDNEJlkC" role="2S7zOq">
@@ -1886,58 +1889,15 @@
                       <node concept="3Tm1VV" id="2D4fPPvmuSG" role="1B3o_S" />
                       <node concept="3cqZAl" id="2D4fPPvmuSI" role="3clF45" />
                       <node concept="3clFbS" id="2D4fPPvmuSJ" role="3clF47">
-                        <node concept="3clFbF" id="2D4fPPvkgAX" role="3cqZAp">
-                          <node concept="2OqwBi" id="2D4fPPvkgPk" role="3clFbG">
-                            <node concept="37vLTw" id="2D4fPPvkgAW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="l3$K9zOJ_Q" resolve="project" />
-                            </node>
-                            <node concept="liA8E" id="2D4fPPvkj9Z" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getProjectModels()" resolve="getProjectModels" />
-                            </node>
-                          </node>
-                        </node>
                         <node concept="2Gpval" id="2D4fPPvkp6E" role="3cqZAp">
                           <node concept="2GrKxI" id="2D4fPPvkp6G" role="2Gsz3X">
                             <property role="TrG5h" value="mdule" />
                           </node>
                           <node concept="3clFbS" id="2D4fPPvkp6K" role="2LFqv$">
-                            <node concept="3clFbJ" id="2D4fPPvkpZd" role="3cqZAp">
-                              <node concept="3fqX7Q" id="2D4fPPvkqRW" role="3clFbw">
-                                <node concept="2ZW3vV" id="2D4fPPvkuxj" role="3fr31v">
-                                  <node concept="3uibUv" id="2D4fPPvkuXT" role="2ZW6by">
-                                    <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
-                                  </node>
-                                  <node concept="2GrUjf" id="2D4fPPvkrMp" role="2ZW6bz">
-                                    <ref role="2Gs0qQ" node="2D4fPPvkp6G" resolve="mdule" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbS" id="2D4fPPvkpZf" role="3clFbx">
-                                <node concept="3N13vt" id="2D4fPPvkzwd" role="3cqZAp" />
-                              </node>
-                            </node>
                             <node concept="1DcWWT" id="2VBjJfTA86Q" role="3cqZAp">
                               <node concept="3clFbS" id="2VBjJfTA86S" role="2LFqv$">
                                 <node concept="1DcWWT" id="2YF67BpFaKB" role="3cqZAp">
                                   <node concept="3clFbS" id="2YF67BpFaKD" role="2LFqv$">
-                                    <node concept="3cpWs8" id="l3$K9$qozF" role="3cqZAp">
-                                      <node concept="3cpWsn" id="l3$K9$qozI" role="3cpWs9">
-                                        <property role="TrG5h" value="iwiv" />
-                                        <node concept="3Tqbb2" id="l3$K9$qozD" role="1tU5fm">
-                                          <ref role="ehGHo" to="2c95:l3$K9zOTz5" resolve="IWordInViewer" />
-                                        </node>
-                                        <node concept="1eOMI4" id="l3$K9$qr6S" role="33vP2m">
-                                          <node concept="10QFUN" id="l3$K9$qr6P" role="1eOMHV">
-                                            <node concept="3Tqbb2" id="l3$K9$qr6U" role="10QFUM">
-                                              <ref role="ehGHo" to="2c95:l3$K9zOTz5" resolve="IWordInViewer" />
-                                            </node>
-                                            <node concept="37vLTw" id="l3$K9$qsgy" role="10QFUP">
-                                              <ref role="3cqZAo" node="2YF67BpFaKE" resolve="n" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
                                     <node concept="3clFbF" id="2VBjJfU2A4w" role="3cqZAp">
                                       <node concept="2OqwBi" id="2VBjJfU2A4x" role="3clFbG">
                                         <node concept="37vLTw" id="2VBjJfU2A4y" role="2Oq$k0">
@@ -1950,17 +1910,15 @@
                                               <node concept="37vLTw" id="2VBjJfU2A4A" role="37wK5m">
                                                 <ref role="3cqZAo" node="2VBjJfTA86T" resolve="mdl" />
                                               </node>
-                                              <node concept="2ShNRf" id="2VBjJfU2A4B" role="37wK5m">
-                                                <node concept="1pGfFk" id="2VBjJfU2A4C" role="2ShVmc">
-                                                  <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
-                                                  <node concept="37vLTw" id="2VBjJfU2A4D" role="37wK5m">
-                                                    <ref role="3cqZAo" node="2YF67BpFaKE" resolve="n" />
-                                                  </node>
+                                              <node concept="2OqwBi" id="2x4nHT4$b04" role="37wK5m">
+                                                <node concept="37vLTw" id="2x4nHT4$2rr" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="2YF67BpFaKE" resolve="iwiv" />
                                                 </node>
+                                                <node concept="iZEcu" id="2x4nHT4$j55" role="2OqNvi" />
                                               </node>
                                               <node concept="2OqwBi" id="l3$K9$sG4Z" role="37wK5m">
                                                 <node concept="37vLTw" id="l3$K9$sFdU" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="l3$K9$qozI" resolve="iwiv" />
+                                                  <ref role="3cqZAo" node="2YF67BpFaKE" resolve="iwiv" />
                                                 </node>
                                                 <node concept="2qgKlT" id="l3$K9$sGCR" role="2OqNvi">
                                                   <ref role="37wK5l" to="4gky:l3$K9zS58p" resolve="TagInViewer" />
@@ -1968,7 +1926,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="36$yFdGc_2z" role="37wK5m">
                                                 <node concept="37vLTw" id="l3$K9$qsWl" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="l3$K9$qozI" resolve="iwiv" />
+                                                  <ref role="3cqZAo" node="2YF67BpFaKE" resolve="iwiv" />
                                                 </node>
                                                 <node concept="2qgKlT" id="l3$K9$qtk0" role="2OqNvi">
                                                   <ref role="37wK5l" to="4gky:l3$K9zS66z" resolve="TextInViewer" />
@@ -1985,22 +1943,23 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="3clFbH" id="2YF67BpFaKC" role="3cqZAp" />
                                   </node>
                                   <node concept="3cpWsn" id="2YF67BpFaKE" role="1Duv9x">
-                                    <property role="TrG5h" value="n" />
-                                    <node concept="3uibUv" id="2YF67BpGwk2" role="1tU5fm">
-                                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                                    <property role="TrG5h" value="iwiv" />
+                                    <node concept="3Tqbb2" id="2x4nHT4z90A" role="1tU5fm">
+                                      <ref role="ehGHo" to="2c95:l3$K9zOTz5" resolve="IWordInViewer" />
                                     </node>
                                   </node>
-                                  <node concept="2YIFZM" id="2YF67BpFg08" role="1DdaDG">
-                                    <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
-                                    <ref role="37wK5l" to="w1kc:~SModelOperations.getNodes(org.jetbrains.mps.openapi.model.SModel,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="getNodes" />
-                                    <node concept="37vLTw" id="2YF67BpFh3y" role="37wK5m">
+                                  <node concept="2OqwBi" id="2x4nHT4ykRP" role="1DdaDG">
+                                    <node concept="37vLTw" id="2x4nHT4ydZi" role="2Oq$k0">
                                       <ref role="3cqZAo" node="2VBjJfTA86T" resolve="mdl" />
                                     </node>
-                                    <node concept="37vLTw" id="6HWKDNEHzzI" role="37wK5m">
-                                      <ref role="3cqZAo" node="6HWKDNEIjLU" resolve="chosenWord" />
+                                    <node concept="2SmgA7" id="2x4nHT4yso0" role="2OqNvi">
+                                      <node concept="25Kdxt" id="2x4nHT4yz93" role="1dBWTz">
+                                        <node concept="37vLTw" id="2x4nHT4yGnT" role="25KhWn">
+                                          <ref role="3cqZAo" node="6HWKDNEIjLU" resolve="chosenWord" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -2014,7 +1973,7 @@
                                   <ref role="2Gs0qQ" node="2D4fPPvkp6G" resolve="mdule" />
                                 </node>
                                 <node concept="liA8E" id="2VBjJfTAcxv" role="2OqNvi">
-                                  <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
+                                  <ref role="37wK5l" to="31cb:~SModuleBase.getModels()" resolve="getModels" />
                                 </node>
                               </node>
                             </node>
@@ -2024,7 +1983,10 @@
                               <ref role="3cqZAo" node="l3$K9zOJ_Q" resolve="project" />
                             </node>
                             <node concept="liA8E" id="2D4fPPvkphc" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~IProject.getProjectModules()" resolve="getProjectModules" />
+                              <ref role="37wK5l" to="z1c3:~Project.getProjectModules(java.lang.Class)" resolve="getProjectModules" />
+                              <node concept="3VsKOn" id="2x4nHT4xOjz" role="37wK5m">
+                                <ref role="3VsUkX" to="z1c3:~Solution" resolve="Solution" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -2261,7 +2223,7 @@
                     <node concept="3clFbF" id="5KpcOHhQ2AK" role="3cqZAp">
                       <node concept="2OqwBi" id="5KpcOHhQ2AL" role="3clFbG">
                         <node concept="37vLTw" id="5KpcOHhQ2AM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5KpcOHhQ2AO" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2AE" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5KpcOHhQ2AN" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SLanguage.getConcepts()" resolve="getConcepts" />
@@ -2269,9 +2231,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5KpcOHhQ2AO" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2AE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5KpcOHhQ2AP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2AF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2296,7 +2258,7 @@
                     <node concept="3clFbF" id="5KpcOHhQPBL" role="3cqZAp">
                       <node concept="2OqwBi" id="5KpcOHhQPBM" role="3clFbG">
                         <node concept="37vLTw" id="5KpcOHhQPBN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5KpcOHhQPBQ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2AG" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5KpcOHhQPBO" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
@@ -2307,9 +2269,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5KpcOHhQPBQ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2AG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5KpcOHhQPBR" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2AH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2330,14 +2292,14 @@
                         <ref role="cht4Q" to="2c95:l3$K9zOTz5" resolve="IWordInViewer" />
                       </node>
                       <node concept="37vLTw" id="6HWKDNEFVta" role="1m5AlR">
-                        <ref role="3cqZAo" node="6HWKDNEFRpw" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2AI" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6HWKDNEFRpw" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2AI" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6HWKDNEFRpx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2AJ" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl
index 2e93e253f45..f50da94422e 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl
@@ -35,7 +35,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -91,7 +91,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -103,7 +102,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/generator/template/com/mbeddr/slides/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/generator/template/com/mbeddr/slides/generator/template/main@generator.mps
index 749f7014191..57fa83a24c8 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/generator/template/com/mbeddr/slides/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/generator/template/com/mbeddr/slides/generator/template/main@generator.mps
@@ -42,7 +42,7 @@
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -154,7 +154,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/behavior.mps
index d7d6135a65f..3e18d9ab9f1 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/behavior.mps
@@ -47,7 +47,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -66,7 +66,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/editor.mps
index b9481775336..64f98afb268 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/editor.mps
@@ -16,9 +16,9 @@
     <import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" />
     <import index="2c95" ref="r:5f7188a9-e7b4-4a2e-bef9-38d2cf379fdc(com.mbeddr.doc.structure)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
+    <import index="ag3p" ref="04e1f940-330e-483b-9a6a-1648b396a81c/r:4f3facd2-2d6c-40e4-a229-cdeb0a5137d8(com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.runtime)" />
     <import index="tj7y" ref="04e1f940-330e-483b-9a6a-1648b396a81c/r:db2c041e-54bd-4fbb-9087-056c7a8ef247(com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.editor)" />
     <import index="z726" ref="r:6b7eb85f-64d8-4de6-8906-0e18804729df(com.mbeddr.doc.editor)" />
-    <import index="ag3p" ref="04e1f940-330e-483b-9a6a-1648b396a81c/r:4f3facd2-2d6c-40e4-a229-cdeb0a5137d8(com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.runtime)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -63,7 +63,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -90,7 +90,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -180,7 +180,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -201,7 +201,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -226,7 +226,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/intentions.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/intentions.mps
index a439e8e40dc..8256e1dccff 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/intentions.mps
@@ -55,7 +55,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/structure.mps
index 3ce3f1c945a..6c7fbcaffa7 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/languageModels/structure.mps
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps
index 99bc920235c..258497ac28b 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps
@@ -63,7 +63,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,7 +78,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps
index 1e110838447..701bca6f2ba 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps
@@ -120,7 +120,7 @@
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -227,7 +227,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/behavior.mps
index 1a0d4108650..bbccaab52e7 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/behavior.mps
@@ -92,7 +92,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -107,7 +107,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -120,6 +120,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -185,7 +186,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -204,7 +205,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -395,7 +395,7 @@
                         <node concept="2OqwBi" id="79i$vAY2ezZ" role="3uHU7B">
                           <node concept="2yIwOk" id="79i$vAY2e$0" role="2OqNvi" />
                           <node concept="37vLTw" id="1LnB5xdJebw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1LnB5xdJeby" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN23q" resolve="it" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="79i$vAY2e$1" role="3uHU7w">
@@ -407,9 +407,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1LnB5xdJeby" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23q" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1LnB5xdJebz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN23r" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/com.mbeddr.spreadsheat.enumMigration.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/com.mbeddr.spreadsheat.enumMigration.mps
index 07f92d15f1d..6499cbc95d7 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/com.mbeddr.spreadsheat.enumMigration.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/com.mbeddr.spreadsheat.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/constraints.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/constraints.mps
index 6e0072dab30..4c9bc19a09c 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/constraints.mps
@@ -50,7 +50,7 @@
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/editor.mps
index 6980ec03db3..710d65ae4da 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/editor.mps
@@ -65,7 +65,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -84,7 +84,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -153,7 +153,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -190,7 +190,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/structure.mps
index 7d4c2aa4871..b6c83680699 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/structure.mps
@@ -73,7 +73,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl
index b4bea33b103..638d5df6ddf 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
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.spreadsheat" uuid="1d891f7b-dc93-42f9-a4bc-b016656b14e2" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="languageModels" />
     </modelRoot>
-    <modelRoot contentPath="${module}" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}">
       <sourceRoot location="lib/commons-codec-1.10.jar" />
       <sourceRoot location="lib/commons-collections4-4.1.jar" />
       <sourceRoot location="lib/curvesapi-1.04.jar" />
@@ -16,6 +16,27 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/commons-collections4-4.1.jar" />
+      <library location="${module}/lib/curvesapi-1.04.jar" />
+      <library location="${module}/lib/commons-codec-1.10.jar" />
+      <library location="${module}/lib/poi-5.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-5.0.0.jar" />
+      <library location="${module}/lib/xmlbeans-4.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
+      <library location="${module}/lib/commons-codec-1.10.jar" />
+      <library location="${module}/lib/commons-collections4-4.1.jar" />
+      <library location="${module}/lib/curvesapi-1.04.jar" />
+      <library location="${module}/lib/poi-5.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-5.0.0.jar" />
+      <library location="${module}/lib/xmlbeans-4.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
+      <library location="${module}/lib/commons-codec-1.10.jar" />
+      <library location="${module}/lib/commons-collections4-4.1.jar" />
+      <library location="${module}/lib/curvesapi-1.04.jar" />
+      <library location="${module}/lib/poi-5.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-5.0.0.jar" />
+      <library location="${module}/lib/xmlbeans-4.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
     </facet>
   </facets>
   <accessoryModels />
@@ -40,7 +61,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -118,7 +139,6 @@
     <stubModelEntry path="${module}/lib/xmlbeans-4.0.0.jar" />
     <stubModelEntry path="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
   </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
@@ -126,7 +146,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl b/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl
index ce1137f5c08..724f88750d5 100644
--- a/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl
+++ b/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl
@@ -36,7 +36,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -105,7 +105,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -119,7 +118,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.doc/languages/terms/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/terms/languageModels/behavior.mps
index 5f338da34c4..5ef6b7e435b 100644
--- a/code/languages/com.mbeddr.doc/languages/terms/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/terms/languageModels/behavior.mps
@@ -82,7 +82,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,12 +93,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -132,7 +133,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -158,7 +159,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
     </language>
   </registry>
@@ -273,7 +273,7 @@
                     <node concept="3clFbF" id="14uWAuriAut" role="3cqZAp">
                       <node concept="2OqwBi" id="14uWAuriAuu" role="3clFbG">
                         <node concept="37vLTw" id="14uWAuriAuv" role="2Oq$k0">
-                          <ref role="3cqZAo" node="14uWAuriAuz" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN23t" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="14uWAuriAuw" role="2OqNvi">
                           <node concept="1xMEDy" id="14uWAuriAux" role="1xVPHs">
@@ -285,9 +285,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="14uWAuriAuz" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23t" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="14uWAuriAu$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN23u" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.doc/languages/terms/languageModels/constraints.mps b/code/languages/com.mbeddr.doc/languages/terms/languageModels/constraints.mps
index 506a7788f30..f8ca5beccb8 100644
--- a/code/languages/com.mbeddr.doc/languages/terms/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.doc/languages/terms/languageModels/constraints.mps
@@ -45,7 +45,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps
index 413fdc57760..fd695c4f4d2 100644
--- a/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps
@@ -66,7 +66,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -88,7 +88,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -117,7 +117,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +127,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/languages/terms/languageModels/intentions.mps b/code/languages/com.mbeddr.doc/languages/terms/languageModels/intentions.mps
index 051815146c7..7eb3cf5f9c8 100644
--- a/code/languages/com.mbeddr.doc/languages/terms/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.doc/languages/terms/languageModels/intentions.mps
@@ -87,7 +87,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -106,6 +106,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -178,7 +179,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -189,7 +190,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -279,7 +279,7 @@
                             </node>
                             <node concept="2OqwBi" id="2mAwexAtCmV" role="3uHU7w">
                               <node concept="37vLTw" id="2mAwexAtCmW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2mAwexAtCn0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN23v" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="2mAwexAtCmX" role="2OqNvi">
                                 <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -293,9 +293,9 @@
                       <property role="TrG5h" value="s" />
                       <node concept="17QB3L" id="2mAwexAtCmZ" role="1tU5fm" />
                     </node>
-                    <node concept="Rh6nW" id="2mAwexAtCn0" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN23v" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2mAwexAtCn1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN23w" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="Xl_RD" id="2mAwexAtCn2" role="1MDeny">
@@ -345,7 +345,7 @@
                       <node concept="2OqwBi" id="2mAwexAtNLg" role="3clFbG">
                         <node concept="2OqwBi" id="2mAwexAtNLh" role="2Oq$k0">
                           <node concept="37vLTw" id="2mAwexAtNLi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2mAwexAtNLm" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN23x" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2mAwexAtNLj" role="2OqNvi">
                             <ref role="3TsBF5" to="8zu2:7rXn3flJFxj" resolve="term" />
@@ -360,9 +360,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2mAwexAtNLm" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23x" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2mAwexAtNLn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN23y" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -575,7 +575,7 @@
                             </node>
                             <node concept="2OqwBi" id="3EwB7OlCGjZ" role="3uHU7w">
                               <node concept="37vLTw" id="3EwB7OlCGk0" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3EwB7OlCGk4" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN23z" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="3EwB7OlCGk1" role="2OqNvi">
                                 <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -589,9 +589,9 @@
                       <property role="TrG5h" value="s" />
                       <node concept="17QB3L" id="3EwB7OlCGk3" role="1tU5fm" />
                     </node>
-                    <node concept="Rh6nW" id="3EwB7OlCGk4" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN23z" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3EwB7OlCGk5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN23$" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="Xl_RD" id="3EwB7OlCGk6" role="1MDeny">
diff --git a/code/languages/com.mbeddr.doc/languages/terms/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/terms/languageModels/structure.mps
index 459baba11b8..f21878d801f 100644
--- a/code/languages/com.mbeddr.doc/languages/terms/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.doc/languages/terms/languageModels/structure.mps
@@ -51,7 +51,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd
index ceffafdf446..97acf22a9a6 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.doc" uuid="c87fbd33-5a05-41e8-ac53-491a30791f53" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.doc" uuid="c87fbd33-5a05-41e8-ac53-491a30791f53" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -54,7 +53,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/exampleCCode.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/exampleCCode.mps
index ed6ab2bd657..14a6a405f5d 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/exampleCCode.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/exampleCCode.mps
@@ -10,7 +10,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -43,7 +43,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -75,7 +75,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -83,14 +83,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -141,7 +141,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -177,7 +177,7 @@
       </concept>
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="22102029902365709" name="com.mbeddr.core.expressions.structure.AssignmentExpr" flags="ng" index="3pqW6w" />
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd
index 70aa04a5a13..ac2ba57ddca 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.markdown.sandbox" uuid="80f3203b-1deb-4dd7-a52f-b1d78f9f96c8" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.markdown.sandbox" uuid="80f3203b-1deb-4dd7-a52f-b1d78f9f96c8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="generator" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
@@ -29,7 +28,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.example.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.example.mps
index 032e7cee174..591b1acbcb1 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.example.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.example.mps
@@ -47,20 +47,20 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.markdown.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.markdown.mps
index 31ba6c7a6d1..fcd54bb53c9 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.markdown.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.markdown.mps
@@ -45,7 +45,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 07792fe96da..db4ba1d0d07 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.slides.sandbox" uuid="e26732a8-c7d7-4326-8a4a-31f87521971f" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.slides.sandbox" uuid="e26732a8-c7d7-4326-8a4a-31f87521971f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="4" />
@@ -27,7 +26,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/models/com/mbeddr/doc/slides/sandbox/main.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/models/com/mbeddr/doc/slides/sandbox/main.mps
index d2734136605..1c851c5ad02 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/models/com/mbeddr/doc/slides/sandbox/main.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/models/com/mbeddr/doc/slides/sandbox/main.mps
@@ -45,7 +45,7 @@
       </concept>
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136521407" name="com.mbeddr.doc.structure.Resource" flags="ng" index="2Sb_l4">
@@ -70,7 +70,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd
index 32ceca4eeb4..fb74609a784 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.doc.test.documents" uuid="4078ebaa-02fd-430a-ab03-975592a2372c" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.doc.test.documents" uuid="4078ebaa-02fd-430a-ab03-975592a2372c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
@@ -30,7 +29,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/code.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/code.mps
index 70b8a21e1c2..5e4569e75cf 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/code.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/code.mps
@@ -44,7 +44,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -66,7 +66,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2_1.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2_1.mps
index 853861d59f1..733339ed6fb 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2_1.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2_1.mps
@@ -23,7 +23,7 @@
       <concept id="6165313375056012512" name="com.mbeddr.doc.structure.DocumentInclude" flags="ng" index="$CzcT">
         <child id="6165313375056012515" name="ref" index="$CzcU" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -49,7 +49,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -67,7 +67,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 c55ff9588a0..62c4dadb7ac 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.spreadsheat.sandbox" uuid="121d8f40-e9c3-4a86-8112-df505855b45e" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.spreadsheat.sandbox" uuid="121d8f40-e9c3-4a86-8112-df505855b45e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps
index b89edc76390..e610e3bb2b4 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps
@@ -9,7 +9,7 @@
     <language id="1d891f7b-dc93-42f9-a4bc-b016656b14e2" name="com.mbeddr.spreadsheat">
       <concept id="2042272859107050152" name="com.mbeddr.spreadsheat.structure.Style" flags="ng" index="1hadVK" />
       <concept id="2042272859107001907" name="com.mbeddr.spreadsheat.structure.RowGroup" flags="ng" index="1hahDF" />
-      <concept id="2042272859107001892" name="com.mbeddr.spreadsheat.structure.IGroup" flags="ng" index="1hahDW">
+      <concept id="2042272859107001892" name="com.mbeddr.spreadsheat.structure.IGroup" flags="ngI" index="1hahDW">
         <property id="2042272859107001893" name="start" index="1hahDX" />
         <property id="2042272859107001894" name="end" index="1hahDY" />
       </concept>
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.doc/tests/tests.ts.doc/models/testBuildConfigPresence@tests.mps b/code/languages/com.mbeddr.doc/tests/tests.ts.doc/models/testBuildConfigPresence@tests.mps
index 346946b4fbf..fbf2e3502cb 100644
--- a/code/languages/com.mbeddr.doc/tests/tests.ts.doc/models/testBuildConfigPresence@tests.mps
+++ b/code/languages/com.mbeddr.doc/tests/tests.ts.doc/models/testBuildConfigPresence@tests.mps
@@ -26,7 +26,7 @@
       <concept id="1215603922101" name="jetbrains.mps.lang.test.structure.NodeOperationsContainer" flags="ng" index="7CXmI">
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -42,7 +42,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
@@ -61,7 +61,7 @@
       <concept id="7717755763392524104" name="com.mbeddr.core.buildconfig.structure.BuildConfiguration" flags="ng" index="2v9HqL" />
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136472795" name="com.mbeddr.doc.structure.PathDefinition" flags="ng" index="2SbYGw">
@@ -74,7 +74,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596579911728" name="com.mbeddr.doc.structure.Document" flags="ng" index="1_1swa">
@@ -89,14 +89,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -126,7 +126,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd b/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd
index 48e083b2957..deb978aac9f 100644
--- a/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd
+++ b/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tests.ts.doc" uuid="fdf8949f-50fd-4f1a-ba07-726db58b6214" moduleVersion="0" compileInMPS="true">
+<solution name="tests.ts.doc" uuid="fdf8949f-50fd-4f1a-ba07-726db58b6214" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
   </dependencies>
@@ -35,7 +34,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/.mps/migration.xml b/code/languages/com.mbeddr.ext/.mps/migration.xml
index 273d8e8a3ee..65112394c89 100644
--- a/code/languages/com.mbeddr.ext/.mps/migration.xml
+++ b/code/languages/com.mbeddr.ext/.mps/migration.xml
@@ -20,6 +20,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -28,6 +30,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd
index d0e11a94419..6ae7ededf7a 100644
--- a/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.ext.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.ext.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.ext.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/models/com/mbeddr/ext/__spreferences/PlatformTemplates.mps b/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/models/com/mbeddr/ext/__spreferences/PlatformTemplates.mps
index 3926a5b92e9..597ad010af9 100644
--- a/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/models/com/mbeddr/ext/__spreferences/PlatformTemplates.mps
+++ b/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/models/com/mbeddr/ext/__spreferences/PlatformTemplates.mps
@@ -23,12 +23,12 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd
index 95ec935666c..9a70bca5ea5 100644
--- a/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd
+++ b/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.ext.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.ext.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.ext.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd
index bad2af1f225..dd2eb56a4ec 100644
--- a/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.ext.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.ext.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.ext.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl
index 6db89dfb0f0..84338c22564 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl
@@ -56,7 +56,7 @@
         <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -127,7 +127,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -309,7 +308,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">3f445ef3-54ad-4ae5-a22d-91c3ce06375e(com.mbeddr.ext.components.concurrency)</dependency>
@@ -323,7 +321,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -403,7 +401,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/generator/template/main@generator.mps
index 1d970e17db7..ca205145bfb 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/generator/template/main@generator.mps
@@ -120,7 +120,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -135,7 +135,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -178,7 +178,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -232,6 +232,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -258,7 +259,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="1559086634919122156" name="com.mbeddr.core.modules.structure.NameOfFunctionExpression" flags="ng" index="2HMMB$">
@@ -268,7 +269,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -356,7 +357,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -417,7 +418,7 @@
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -431,7 +432,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -463,7 +464,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -562,7 +562,7 @@
                               <node concept="3fqX7Q" id="3qlQk_gl8Ue" role="3clFbG">
                                 <node concept="2OqwBi" id="3qlQk_gl99W" role="3fr31v">
                                   <node concept="37vLTw" id="3qlQk_gl8ZO" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3qlQk_gl8H4" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN23R" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="3qlQk_gla4$" role="2OqNvi">
                                     <node concept="chp4Y" id="3qlQk_glai7" role="cj9EA">
@@ -573,9 +573,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3qlQk_gl8H4" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN23R" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3qlQk_gl8H5" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN23S" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1632,7 +1632,7 @@
                             <node concept="3clFbF" id="3qlQk_gnUbV" role="3cqZAp">
                               <node concept="2OqwBi" id="3qlQk_gnUj5" role="3clFbG">
                                 <node concept="37vLTw" id="3qlQk_gnUbU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3qlQk_gnTZ$" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN23T" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="3qlQk_gnUFs" role="2OqNvi">
                                   <ref role="37wK5l" to="l8pw:3qlQk_ggqsk" resolve="unwrap" />
@@ -1640,9 +1640,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3qlQk_gnTZ$" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN23T" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3qlQk_gnTZ_" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN23U" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2246,7 +2246,7 @@
                           <node concept="2OqwBi" id="2kF1PD7dxub" role="3uHU7B">
                             <node concept="2OqwBi" id="7tWSY$ORPeG" role="2Oq$k0">
                               <node concept="37vLTw" id="7tWSY$ORP6W" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7tWSY$OROZC" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN23V" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2kF1PD7dx7k" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qnb1:2kF1PD7cs3s" resolve="instanceRef" />
@@ -2259,9 +2259,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7tWSY$OROZC" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN23V" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7tWSY$OROZD" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN23W" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2689,7 +2689,7 @@
                         <node concept="30H73N" id="7tWSY$OTmuJ" role="3uHU7w" />
                         <node concept="2OqwBi" id="7tWSY$OTlsO" role="3uHU7B">
                           <node concept="37vLTw" id="7tWSY$OTll4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7tWSY$OTldK" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN23X" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7tWSY$OTlOv" role="2OqNvi">
                             <ref role="3Tt5mk" to="qnb1:7tWSY$ONvaG" resolve="field" />
@@ -2698,9 +2698,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7tWSY$OTldK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23X" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7tWSY$OTldL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN23Y" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageAccessories/com/mbeddr/ext/components/concurrency/util.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageAccessories/com/mbeddr/ext/components/concurrency/util.mps
index e28a45e4c5e..6fdff7d4e94 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageAccessories/com/mbeddr/ext/components/concurrency/util.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageAccessories/com/mbeddr/ext/components/concurrency/util.mps
@@ -99,7 +99,7 @@
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,12 +113,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -174,7 +175,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -193,7 +194,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -438,7 +438,7 @@
                     <node concept="3clFbF" id="2kF1PD7c53j" role="3cqZAp">
                       <node concept="2OqwBi" id="2kF1PD7c53k" role="3clFbG">
                         <node concept="37vLTw" id="2kF1PD7c53l" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2kF1PD7c53n" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN23A" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2kF1PD7c53m" role="2OqNvi">
                           <ref role="37wK5l" to="eup9:6JVEnxIhC2$" resolve="instances" />
@@ -446,9 +446,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2kF1PD7c53n" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23A" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2kF1PD7c53o" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN23B" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -463,7 +463,7 @@
                       </node>
                       <node concept="2OqwBi" id="2kF1PD7c7e1" role="3uHU7B">
                         <node concept="37vLTw" id="2kF1PD7c6ZJ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2kF1PD7c6N1" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN23C" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2kF1PD7c8Na" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -472,9 +472,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2kF1PD7c6N1" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN23C" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2kF1PD7c6N2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN23D" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -557,7 +557,7 @@
                       </node>
                       <node concept="2OqwBi" id="2kF1PD7nD2l" role="3uHU7B">
                         <node concept="37vLTw" id="2kF1PD7nCUo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2kF1PD7nCO7" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN23E" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="2kF1PD7nDJg" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -566,9 +566,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2kF1PD7nCO7" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN23E" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2kF1PD7nCO8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN23F" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -629,7 +629,7 @@
                             <node concept="2OqwBi" id="2kF1PD7dCqy" role="3uHU7B">
                               <node concept="2OqwBi" id="7tWSY$OSybU" role="2Oq$k0">
                                 <node concept="37vLTw" id="7tWSY$OSy2P" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7tWSY$OSxQP" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN23G" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="2kF1PD7dBSe" role="2OqNvi">
                                   <ref role="3Tt5mk" to="qnb1:2kF1PD7cs3s" resolve="instanceRef" />
@@ -642,9 +642,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7tWSY$OSxQP" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN23G" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7tWSY$OSxQQ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN23H" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -655,7 +655,7 @@
                       <node concept="3clFbF" id="7tWSY$OPS61" role="3cqZAp">
                         <node concept="2OqwBi" id="7tWSY$OPSbi" role="3clFbG">
                           <node concept="37vLTw" id="7tWSY$OPS60" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7tWSY$OPS3d" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN23I" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7tWSY$OPSuw" role="2OqNvi">
                             <ref role="3Tt5mk" to="qnb1:7tWSY$ONvgv" resolve="runnable" />
@@ -663,9 +663,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7tWSY$OPS3d" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN23I" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7tWSY$OPS3e" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN23J" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -679,7 +679,7 @@
                     <node concept="2OqwBi" id="7tWSY$OQ2s5" role="3clFbG">
                       <node concept="2OqwBi" id="7tWSY$OPWOt" role="2Oq$k0">
                         <node concept="37vLTw" id="7tWSY$OPWu_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7tWSY$OPWrT" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN23K" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7tWSY$OQ0Uh" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -689,9 +689,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7tWSY$OPWrT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN23K" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7tWSY$OPWrU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN23L" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -898,7 +898,7 @@
                     <node concept="3clFbF" id="64JBwg_qnue" role="3cqZAp">
                       <node concept="2OqwBi" id="64JBwg_qnuf" role="3clFbG">
                         <node concept="37vLTw" id="64JBwg_qnug" role="2Oq$k0">
-                          <ref role="3cqZAo" node="64JBwg_qnui" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN23M" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="64JBwg_qnuh" role="2OqNvi">
                           <ref role="37wK5l" to="eup9:6JVEnxIhC2$" resolve="instances" />
@@ -906,9 +906,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="64JBwg_qnui" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23M" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="64JBwg_qnuj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN23N" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -920,7 +920,7 @@
                     <node concept="2OqwBi" id="64JBwg_qph3" role="3clFbG">
                       <node concept="2OqwBi" id="64JBwg_qnuq" role="2Oq$k0">
                         <node concept="37vLTw" id="64JBwg_qnur" role="2Oq$k0">
-                          <ref role="3cqZAo" node="64JBwg_qnut" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN23O" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="64JBwg_qnus" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -934,9 +934,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="64JBwg_qnut" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN23O" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="64JBwg_qnuu" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN23P" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/behavior.mps
index fd4e2e4210b..761e955af4c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/behavior.mps
@@ -91,7 +91,7 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -99,7 +99,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -146,7 +146,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/constraints.mps
index b1ab2f0335d..0b63a26275c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/constraints.mps
@@ -35,7 +35,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/editor.mps
index dbe9afeac92..b07a8f0b0d0 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/editor.mps
@@ -34,7 +34,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -61,7 +61,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -96,7 +96,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/structure.mps
index f9165dd2937..dba3bdf2caf 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/structure.mps
@@ -47,7 +47,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/typesystem.mps
index ca72499146b..47fa01ec4ca 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/languageModels/typesystem.mps
@@ -53,7 +53,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl
index e63ca569a3c..06633f7e172 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl
@@ -51,7 +51,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -127,7 +127,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -161,7 +160,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)</dependency>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
@@ -176,7 +174,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -261,7 +259,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/generator/template/main@generator.mps
index 1b9ccaf47b0..855bf08eec7 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/generator/template/main@generator.mps
@@ -90,7 +90,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -100,7 +100,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -137,7 +137,7 @@
       <concept id="5015072279636592410" name="jetbrains.mps.lang.generator.structure.VarMacro_ValueQuery" flags="in" index="2jfdEK" />
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -190,6 +190,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -214,14 +215,14 @@
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -317,7 +318,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -330,7 +331,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -345,7 +346,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -1053,15 +1053,15 @@
                     <node concept="3clFbF" id="3F9kUGaLBiH" role="3cqZAp">
                       <node concept="2OqwBi" id="3F9kUGaLBDR" role="3clFbG">
                         <node concept="37vLTw" id="3F9kUGaLBiG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3F9kUGaLAne" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN24E" resolve="it" />
                         </node>
                         <node concept="3AV6Ez" id="3F9kUGaLKfF" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3F9kUGaLAne" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN24E" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3F9kUGaLAnf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN24F" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1073,7 +1073,7 @@
                     <node concept="2OqwBi" id="3F9kUG9G2fb" role="3clFbG">
                       <node concept="2OqwBi" id="3F9kUG9FNGT" role="2Oq$k0">
                         <node concept="37vLTw" id="3F9kUG9FNuC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3F9kUG9FN7v" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN24G" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="3F9kUG9FXX7" role="2OqNvi">
                           <node concept="3CFYIy" id="3F9kUG9FYkc" role="3CFYIz">
@@ -1085,9 +1085,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3F9kUG9FN7v" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN24G" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3F9kUG9FN7w" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN24H" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/behavior.mps
index a58615be046..6f035c18f3f 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/behavior.mps
@@ -115,7 +115,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +127,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -135,6 +135,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
         <child id="1200830928149" name="expression" index="2n6tg2" />
       </concept>
@@ -211,7 +212,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -236,7 +237,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -488,7 +488,7 @@
                       <node concept="2OqwBi" id="7mgpfAOIF54" role="3clFbG">
                         <node concept="2OqwBi" id="7mgpfAOIw0F" role="2Oq$k0">
                           <node concept="37vLTw" id="7mgpfAOIvAu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7mgpfAOIvaX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN23Z" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="7mgpfAOIAU8" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -511,9 +511,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7mgpfAOIvaX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN23Z" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7mgpfAOIvaY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN240" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -621,7 +621,7 @@
                         <node concept="2OqwBi" id="3F9kUG9CdTA" role="3uHU7B">
                           <node concept="2OqwBi" id="3F9kUG9Cbwy" role="2Oq$k0">
                             <node concept="37vLTw" id="3F9kUG9CbaB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3F9kUG9BIAv" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN241" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="3F9kUG9CcYY" role="2OqNvi">
                               <node concept="3CFYIy" id="3F9kUG9Cdyq" role="3CFYIz">
@@ -640,7 +640,7 @@
                           </node>
                           <node concept="2OqwBi" id="3F9kUG9BWfE" role="3uHU7B">
                             <node concept="37vLTw" id="3F9kUG9BVSo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3F9kUG9BIAv" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN241" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3F9kUG9BZBI" role="2OqNvi">
                               <ref role="3Tt5mk" to="bs45:7X9xw2qH9LO" resolve="interrupt" />
@@ -650,9 +650,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3F9kUG9BIAv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN241" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3F9kUG9BIAw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN242" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -800,7 +800,7 @@
                     <node concept="1rXfSq" id="3F9kUGaM3wK" role="3clFbG">
                       <ref role="37wK5l" node="3F9kUG9E3eJ" resolve="collectVisibleInterruptRunnableMappings" />
                       <node concept="37vLTw" id="3F9kUGaM3wL" role="37wK5m">
-                        <ref role="3cqZAo" node="3F9kUGaM3wN" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN243" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="3F9kUGaM3wM" role="37wK5m">
                         <ref role="3cqZAo" node="3F9kUGaM3oO" resolve="visibleInterruptRunnableMappings" />
@@ -808,9 +808,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3F9kUGaM3wN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN243" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3F9kUGaM3wO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN244" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -866,7 +866,7 @@
                       <node concept="3EllGN" id="3F9kUGaMksw" role="33vP2m">
                         <node concept="2OqwBi" id="3F9kUGaMksx" role="3ElVtu">
                           <node concept="37vLTw" id="3F9kUGaMksy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3F9kUGaMcBv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN245" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3F9kUGaMksz" role="2OqNvi">
                             <ref role="3Tt5mk" to="bs45:7X9xw2qH9LO" resolve="interrupt" />
@@ -902,7 +902,7 @@
                           <node concept="3EllGN" id="3F9kUGaMSjQ" role="37vLTJ">
                             <node concept="2OqwBi" id="3F9kUGaMTy6" role="3ElVtu">
                               <node concept="37vLTw" id="3F9kUGaMSKn" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3F9kUGaMcBv" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN245" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3F9kUGaMYCX" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bs45:7X9xw2qH9LO" resolve="interrupt" />
@@ -929,15 +929,15 @@
                       </node>
                       <node concept="TSZUe" id="3F9kUGaNhe_" role="2OqNvi">
                         <node concept="37vLTw" id="3F9kUGaNhK6" role="25WWJ7">
-                          <ref role="3cqZAo" node="3F9kUGaMcBv" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN245" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3F9kUGaMcBv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN245" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3F9kUGaMcBw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN246" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -980,7 +980,7 @@
                     <node concept="3clFbF" id="3F9kUG9E3ff" role="3cqZAp">
                       <node concept="2OqwBi" id="3F9kUG9E3fg" role="3clFbG">
                         <node concept="37vLTw" id="3F9kUG9E3fh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3F9kUG9E3fj" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN247" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3F9kUG9E3fi" role="2OqNvi">
                           <ref role="37wK5l" to="l32i:6JVEnxIjbYq" resolve="innerInstanceConfig" />
@@ -988,9 +988,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3F9kUG9E3fj" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN247" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3F9kUG9E3fk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN248" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1002,7 +1002,7 @@
                     <node concept="1rXfSq" id="3F9kUG9E5CB" role="3clFbG">
                       <ref role="37wK5l" node="3F9kUG9E3eJ" resolve="collectVisibleInterruptRunnableMappings" />
                       <node concept="37vLTw" id="3F9kUG9E5U_" role="37wK5m">
-                        <ref role="3cqZAo" node="3F9kUG9E3fs" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN249" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="3F9kUG9E6gs" role="37wK5m">
                         <ref role="3cqZAo" node="3F9kUG9E3fx" resolve="visibleInterruptRunnableMappings" />
@@ -1010,9 +1010,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3F9kUG9E3fs" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN249" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3F9kUG9E3ft" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN24a" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1074,14 +1074,14 @@
                         <ref role="37wK5l" node="3ClwVOAsxoM" resolve="getActiveInstanceConfigurations" />
                         <ref role="1Pybhc" node="3ClwVOAo75a" resolve="ImplementationModuleHelper" />
                         <node concept="37vLTw" id="3ClwVOAt1i0" role="37wK5m">
-                          <ref role="3cqZAo" node="3ClwVOAodpX" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN24b" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3ClwVOAodpX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN24b" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3ClwVOAodpY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN24c" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1227,7 +1227,7 @@
                           <node concept="2OqwBi" id="3ClwVOAptRK" role="2Oq$k0">
                             <node concept="2OqwBi" id="3ClwVOAptRL" role="2Oq$k0">
                               <node concept="37vLTw" id="3ClwVOAptRM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3ClwVOAptRR" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN24d" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3ClwVOAptRN" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bs45:7X9xw2qH9LQ" resolve="runnable" />
@@ -1243,9 +1243,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ClwVOAptRR" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN24d" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ClwVOAptRS" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN24e" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1282,7 +1282,7 @@
                           <node concept="2OqwBi" id="3ClwVOAqr9p" role="2Oq$k0">
                             <node concept="2OqwBi" id="3ClwVOAqr9q" role="2Oq$k0">
                               <node concept="37vLTw" id="3ClwVOAqr9r" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3ClwVOAqr9w" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN24f" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3ClwVOAqr9s" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bs45:7X9xw2qH9LQ" resolve="runnable" />
@@ -1298,9 +1298,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ClwVOAqr9w" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN24f" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ClwVOAqr9x" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN24g" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1317,7 +1317,7 @@
                           <node concept="2OqwBi" id="6tcu$9ntqo7" role="3uHU7B">
                             <node concept="2OqwBi" id="3ClwVOAr0W6" role="2Oq$k0">
                               <node concept="37vLTw" id="3ClwVOAr0w$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3ClwVOAqMrX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN24h" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3ClwVOAr6Mp" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bs45:7X9xw2qH9LP" resolve="instance" />
@@ -1331,7 +1331,7 @@
                         </node>
                         <node concept="2OqwBi" id="3ClwVOAqN8C" role="3uHU7w">
                           <node concept="37vLTw" id="3ClwVOAqMPo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3ClwVOAqMrX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN24h" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3ClwVOAqYqb" role="2OqNvi">
                             <ref role="3Tt5mk" to="bs45:7X9xw2qH9LQ" resolve="runnable" />
@@ -1340,9 +1340,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3ClwVOAqMrX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN24h" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3ClwVOAqMrY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN24i" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/constraints.mps
index b827f2be67a..3230a0f8791 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/constraints.mps
@@ -46,7 +46,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,6 +78,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -121,7 +122,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -129,7 +130,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
@@ -246,7 +246,7 @@
                         <node concept="2OqwBi" id="5CkU_dHimTc" role="3clFbG">
                           <node concept="2OqwBi" id="5CkU_dHimTd" role="2Oq$k0">
                             <node concept="37vLTw" id="5CkU_dHimTe" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHimTi" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN24j" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5CkU_dHimTf" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -260,9 +260,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHimTi" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN24j" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHimTj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN24k" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/editor.mps
index 306adef9fa4..b43bb3ab1d4 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/editor.mps
@@ -46,7 +46,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -65,7 +65,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -95,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/intentions.mps
index f9de182f5f9..10b278165a5 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/intentions.mps
@@ -73,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/structure.mps
index 56b902dd73a..d7a44074614 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/structure.mps
@@ -52,7 +52,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/typesystem.mps
index 1a44d4e8b10..0c4dbe5b19e 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/languageModels/typesystem.mps
@@ -68,7 +68,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,6 +79,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -166,7 +167,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -187,7 +188,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -347,7 +347,7 @@
                   <node concept="2OqwBi" id="RL5s9UOJ9v" role="3clFbG">
                     <node concept="2OqwBi" id="RL5s9UOB5w" role="2Oq$k0">
                       <node concept="37vLTw" id="RL5s9UOAnV" role="2Oq$k0">
-                        <ref role="3cqZAo" node="RL5s9UOAaA" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN24l" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="RL5s9UOF_v" role="2OqNvi">
                         <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -361,9 +361,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="RL5s9UOAaA" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN24l" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="RL5s9UOAaB" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN24m" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -417,7 +417,7 @@
                             </node>
                             <node concept="2OqwBi" id="45k_U8HjuKG" role="3uHU7B">
                               <node concept="37vLTw" id="45k_U8HjtYc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="33VMAJZfyCz" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN24n" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="45k_U8HjvIb" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bs45:7X9xw2qH9LP" resolve="instance" />
@@ -427,7 +427,7 @@
                           <node concept="17R0WA" id="RL5s9UOTFb" role="3uHU7B">
                             <node concept="2OqwBi" id="33VMAJZfyCo" role="3uHU7B">
                               <node concept="37vLTw" id="33VMAJZfyCq" role="2Oq$k0">
-                                <ref role="3cqZAo" node="33VMAJZfyCz" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN24n" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="33VMAJZf_BY" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bs45:7X9xw2qH9LQ" resolve="runnable" />
@@ -440,9 +440,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="33VMAJZfyCz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN24n" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="33VMAJZfyC$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN24o" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -576,13 +576,13 @@
                         <property role="Xl_RC" value="interrupt-triggered runnables are currently only supported for build configurations with a single binary" />
                       </node>
                       <node concept="37vLTw" id="3F9kUGauQyJ" role="1urrMF">
-                        <ref role="3cqZAo" node="3F9kUGauO_a" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN24p" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3F9kUGauO_a" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN24p" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3F9kUGauO_b" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN24q" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -661,7 +661,7 @@
                     </node>
                     <node concept="3EllGN" id="3F9kUGayAjx" role="33vP2m">
                       <node concept="37vLTw" id="3F9kUGayAjy" role="3ElVtu">
-                        <ref role="3cqZAo" node="3F9kUGaw46k" resolve="interrupt" />
+                        <ref role="3cqZAo" node="2SR9xrsN24x" resolve="interrupt" />
                       </node>
                       <node concept="37vLTw" id="3F9kUGayAjz" role="3ElQJh">
                         <ref role="3cqZAo" node="3F9kUGaxr6s" resolve="visibleInterruptRunnableMappings" />
@@ -687,7 +687,7 @@
                                 <node concept="3clFbF" id="3F9kUGaGj_j" role="3cqZAp">
                                   <node concept="2OqwBi" id="3F9kUGaGj_k" role="3clFbG">
                                     <node concept="37vLTw" id="3F9kUGaGj_l" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3F9kUGaGj_p" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN24r" resolve="it" />
                                     </node>
                                     <node concept="2Xjw5R" id="3F9kUGaGj_m" role="2OqNvi">
                                       <node concept="1xMEDy" id="3F9kUGaGj_n" role="1xVPHs">
@@ -699,9 +699,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3F9kUGaGj_p" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN24r" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3F9kUGaGj_q" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN24s" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -745,7 +745,7 @@
                                     <node concept="3JPx81" id="3F9kUGaGdtS" role="2OqNvi">
                                       <node concept="2OqwBi" id="3F9kUGaGf5W" role="25WWJ7">
                                         <node concept="37vLTw" id="3F9kUGaGeeg" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3F9kUGaybz6" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN24t" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="3F9kUGaGi3V" role="2OqNvi">
                                           <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
@@ -755,9 +755,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3F9kUGaybz6" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN24t" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3F9kUGaybz7" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN24u" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -774,7 +774,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="6tcu$9ntquj" role="3uHU7w">
                                         <node concept="37vLTw" id="3ClwVOArcDY" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3F9kUGaw46k" resolve="interrupt" />
+                                          <ref role="3cqZAo" node="2SR9xrsN24x" resolve="interrupt" />
                                         </node>
                                         <node concept="2Iv5rx" id="6tcu$9ntquk" role="2OqNvi" />
                                       </node>
@@ -792,13 +792,13 @@
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="3F9kUGays3Z" role="1urrMF">
-                                  <ref role="3cqZAo" node="3F9kUGayptZ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN24v" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3F9kUGayptZ" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN24v" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3F9kUGaypu0" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN24w" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -816,9 +816,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="3F9kUGaw46k" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN24x" role="1bW2Oz">
                 <property role="TrG5h" value="interrupt" />
-                <node concept="2jxLKc" id="3F9kUGaw46l" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN24y" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -887,7 +887,7 @@
                     </node>
                     <node concept="3EllGN" id="3ClwVOAo5Bm" role="33vP2m">
                       <node concept="37vLTw" id="3ClwVOAo5Bn" role="3ElVtu">
-                        <ref role="3cqZAo" node="3ClwVOAo5CC" resolve="interrupt" />
+                        <ref role="3cqZAo" node="2SR9xrsN24B" resolve="interrupt" />
                       </node>
                       <node concept="37vLTw" id="3ClwVOAo5Bo" role="3ElQJh">
                         <ref role="3cqZAo" node="3ClwVOAo5B5" resolve="visibleInterruptRunnableMappings" />
@@ -908,7 +908,7 @@
                               <node concept="3clFbF" id="3ClwVOApJVn" role="3cqZAp">
                                 <node concept="2OqwBi" id="3ClwVOApJVo" role="3clFbG">
                                   <node concept="37vLTw" id="3ClwVOApJVp" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3ClwVOApJVt" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN24z" resolve="it" />
                                   </node>
                                   <node concept="2Xjw5R" id="3ClwVOApJVq" role="2OqNvi">
                                     <node concept="1xMEDy" id="3ClwVOApJVr" role="1xVPHs">
@@ -920,9 +920,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3ClwVOApJVt" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN24z" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3ClwVOApJVu" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN24$" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -956,7 +956,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="6tcu$9ntqzR" role="3uHU7w">
                                         <node concept="37vLTw" id="3ClwVOAo5Ce" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3ClwVOAo5CC" resolve="interrupt" />
+                                          <ref role="3cqZAo" node="2SR9xrsN24B" resolve="interrupt" />
                                         </node>
                                         <node concept="2Iv5rx" id="6tcu$9ntqzS" role="2OqNvi" />
                                       </node>
@@ -974,13 +974,13 @@
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="3ClwVOAo5Cf" role="1urrMF">
-                                  <ref role="3cqZAo" node="3ClwVOAo5Cg" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN24_" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3ClwVOAo5Cg" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN24_" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3ClwVOAo5Ch" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN24A" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -998,9 +998,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="3ClwVOAo5CC" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN24B" role="1bW2Oz">
                 <property role="TrG5h" value="interrupt" />
-                <node concept="2jxLKc" id="3ClwVOAo5CD" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN24C" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl
index 11b8e2578b5..1ae3ae4dbbf 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl
@@ -66,7 +66,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -149,7 +149,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
@@ -198,7 +197,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">bd640b8f-4be4-42b6-8dc0-2c94d1ddf606(com.mbeddr.ext.components.gen_nomw)</dependency>
@@ -209,7 +207,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -229,7 +227,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -293,7 +291,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/com/mbeddr/ext/components/gen_nomw/generator/gen_nomw_main/util.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/com/mbeddr/ext/components/gen_nomw/generator/gen_nomw_main/util.mps
index e90b2881028..81fb50e2aa9 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/com/mbeddr/ext/components/gen_nomw/generator/gen_nomw_main/util.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/com/mbeddr/ext/components/gen_nomw/generator/gen_nomw_main/util.mps
@@ -86,7 +86,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -99,7 +99,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -110,6 +110,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -176,7 +177,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -215,7 +216,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -272,7 +272,7 @@
                       <node concept="3fqX7Q" id="2VzPqUCq7Ij" role="3clFbG">
                         <node concept="2OqwBi" id="2VzPqUCq7IF" role="3fr31v">
                           <node concept="37vLTw" id="2VzPqUCq7Im" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2VzPqUCq7If" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN24S" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="2VzPqUCq7IM" role="2OqNvi">
                             <node concept="chp4Y" id="2VzPqUCq7IP" role="cj9EA">
@@ -283,9 +283,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2VzPqUCq7If" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN24S" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2VzPqUCq7Ig" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN24T" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -578,7 +578,7 @@
                           <node concept="2OqwBi" id="1nTCJdUqBKh" role="2Oq$k0">
                             <node concept="2OqwBi" id="1nTCJdUqBKi" role="2Oq$k0">
                               <node concept="37vLTw" id="1nTCJdUqBKj" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1nTCJdUqBKr" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN24U" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1nTCJdUqBKk" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTW" resolve="source" />
@@ -606,9 +606,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1nTCJdUqBKr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN24U" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1nTCJdUqBKs" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN24V" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -735,7 +735,7 @@
                             <node concept="2OqwBi" id="1nTCJdUCp_Q" role="2Oq$k0">
                               <node concept="2OqwBi" id="1nTCJdUCnYa" role="2Oq$k0">
                                 <node concept="37vLTw" id="1nTCJdUCnS9" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1nTCJdUCnN5" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN24W" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1nTCJdUCpaT" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTX" resolve="target" />
@@ -752,9 +752,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1nTCJdUCnN5" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN24W" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1nTCJdUCnN6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN24X" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -960,7 +960,7 @@
                             <node concept="2OqwBi" id="7UUkaBfaV$I" role="2Oq$k0">
                               <node concept="2OqwBi" id="7UUkaBfaV$J" role="2Oq$k0">
                                 <node concept="37vLTw" id="7UUkaBfaV$K" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7UUkaBfaV$S" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN24Y" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6JVEnxIi2s$" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTW" resolve="source" />
@@ -988,9 +988,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7UUkaBfaV$S" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN24Y" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7UUkaBfaV$T" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN24Z" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1230,7 +1230,7 @@
                     <node concept="3clFbF" id="4rpFIBbP$iE" role="3cqZAp">
                       <node concept="2OqwBi" id="4rpFIBbP$iF" role="3clFbG">
                         <node concept="37vLTw" id="4rpFIBbP$iG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4rpFIBbP$iI" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN250" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4rpFIBbP$iH" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -1238,9 +1238,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4rpFIBbP$iI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN250" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4rpFIBbP$iJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN251" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1276,7 +1276,7 @@
                     <node concept="1rXfSq" id="4rpFIBbP$j0" role="3clFbG">
                       <ref role="37wK5l" node="4rpFIBbP6ay" resolve="findUsedComponents" />
                       <node concept="37vLTw" id="4rpFIBbP$j1" role="37wK5m">
-                        <ref role="3cqZAo" node="4rpFIBbP$j3" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN252" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="4rpFIBbP$j2" role="37wK5m">
                         <ref role="3cqZAo" node="4rpFIBbP$iM" resolve="allUsedComponents" />
@@ -1284,9 +1284,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4rpFIBbP$j3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN252" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4rpFIBbP$j4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN253" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/main@generator.mps
index 67ee594ccb0..a4a2baffc33 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/generator/template/main@generator.mps
@@ -139,7 +139,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -213,7 +213,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -235,7 +235,7 @@
       <concept id="5485104033529954230" name="com.mbeddr.core.statements.structure.ArbitraryTextAttributePrefix" flags="ng" index="3IwBUS">
         <property id="5485104033529954231" name="text" index="3IwBUT" />
       </concept>
-      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ng" index="3O7dYF">
+      <concept id="605413736672002878" name="com.mbeddr.core.statements.structure.IHasPrefixes" flags="ngI" index="3O7dYF">
         <child id="605413736672002881" name="prefixes" index="3O7dZk" />
       </concept>
       <concept id="1679452829930336984" name="com.mbeddr.core.statements.structure.CommentStatement" flags="ng" index="1QiMYF">
@@ -306,7 +306,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="7473026166162297915" name="jetbrains.mps.lang.generator.structure.DropAttributeRule" flags="lg" index="CY16f">
@@ -324,7 +324,7 @@
         <child id="1169570368028" name="ruleConsequence" index="1fOSGc" />
         <child id="1184616230853" name="contextNodeQuery" index="3gCiVm" />
       </concept>
-      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ng" index="30XT8A">
+      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ngI" index="30XT8A">
         <property id="3265704088513289864" name="comment" index="34cw8o" />
       </concept>
       <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
@@ -385,6 +385,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -517,7 +518,7 @@
         <child id="8551646674110395549" name="argTypes" index="pFrBa" />
         <child id="8551646674110395548" name="returnType" index="pFrBb" />
       </concept>
-      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ng" index="2vgHxx">
+      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ngI" index="2vgHxx">
         <property id="2688792604368329410" name="overriddenCodeLocation" index="2vgHxy" />
       </concept>
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
@@ -526,14 +527,14 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -678,7 +679,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -742,7 +743,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
@@ -804,7 +805,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -1046,7 +1046,7 @@
                         <node concept="2OqwBi" id="3qyGNHcX3Xl" role="3clFbG">
                           <node concept="2OqwBi" id="3qyGNHcX3Xm" role="2Oq$k0">
                             <node concept="37vLTw" id="3qyGNHcX3Xn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3qyGNHcX3Xq" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN254" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="3qyGNHcX3Xo" role="2OqNvi" />
                           </node>
@@ -1056,9 +1056,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3qyGNHcX3Xq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN254" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3qyGNHcX3Xr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN255" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1069,7 +1069,7 @@
                     <node concept="3clFbF" id="3qyGNHcX3Xv" role="3cqZAp">
                       <node concept="2OqwBi" id="3qyGNHcX3Xw" role="3clFbG">
                         <node concept="37vLTw" id="3qyGNHcX3Xx" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3qyGNHcX3X$" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN256" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3qyGNHcX3Xy" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -1080,9 +1080,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3qyGNHcX3X$" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN256" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3qyGNHcX3X_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN257" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1326,7 +1326,7 @@
                               <node concept="2OqwBi" id="3TJMuIHK0He" role="3clFbG">
                                 <node concept="2OqwBi" id="3TJMuIHJXHu" role="2Oq$k0">
                                   <node concept="37vLTw" id="3TJMuIHJX4n" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="XmNy3EzAQd" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN258" resolve="it" />
                                   </node>
                                   <node concept="2Rf3mk" id="3TJMuIHJYul" role="2OqNvi">
                                     <node concept="1xMEDy" id="3TJMuIHJYun" role="1xVPHs">
@@ -1340,9 +1340,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="XmNy3EzAQd" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN258" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="XmNy3EzAQe" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN259" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1406,15 +1406,15 @@
                               <node concept="3clFbF" id="fLfbJaQmr$" role="3cqZAp">
                                 <node concept="2OqwBi" id="fLfbJaQnLA" role="3clFbG">
                                   <node concept="37vLTw" id="fLfbJaQmrz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="fLfbJaQlbL" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25a" resolve="it" />
                                   </node>
                                   <node concept="1$rogu" id="fLfbJaQoIT" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="fLfbJaQlbL" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN25a" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="fLfbJaQlbM" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN25b" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2009,7 +2009,7 @@
                               <node concept="2OqwBi" id="4c3N3BR7SsW" role="3clFbG">
                                 <node concept="2OqwBi" id="4c3N3BR7Z_r" role="2Oq$k0">
                                   <node concept="37vLTw" id="4c3N3BR7RqA" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4c3N3BR6chQ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25c" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4c3N3BR81Cr" role="2OqNvi">
                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -2023,9 +2023,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4c3N3BR6chQ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN25c" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4c3N3BR6chR" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN25d" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2052,7 +2052,7 @@
                               <ref role="3cqZAo" node="3yeYUb91J75" resolve="n" />
                             </node>
                             <node concept="37vLTw" id="3yeYUb91J7K" role="3GDnbk">
-                              <ref role="3cqZAo" node="3yeYUb91J7e" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN25e" resolve="it" />
                             </node>
                           </node>
                           <node concept="3GDn8_" id="3yeYUb91J7S" role="3cqZAp">
@@ -2068,9 +2068,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3yeYUb91J7e" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN25e" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3yeYUb91J7f" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN25f" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2628,7 +2628,7 @@
                                           <node concept="2OqwBi" id="vMpGaXmqxm" role="3fr31v">
                                             <node concept="2OqwBi" id="vMpGaXmqxn" role="2Oq$k0">
                                               <node concept="37vLTw" id="vMpGaXmqxo" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="vMpGaXmqxs" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN25g" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="vMpGaXmqxp" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="v7ag:5oFMniD8XPG" resolve="from" />
@@ -2643,9 +2643,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="vMpGaXmqxs" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN25g" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="vMpGaXmqxt" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN25h" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -2672,7 +2672,7 @@
                                         <ref role="3cqZAo" node="vMpGaXmqxy" resolve="n" />
                                       </node>
                                       <node concept="37vLTw" id="vMpGaXmqxD" role="3GDnbk">
-                                        <ref role="3cqZAo" node="vMpGaXmqxR" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN25i" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3GDn8_" id="vMpGaXmqxE" role="3cqZAp">
@@ -2712,9 +2712,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="vMpGaXmqxR" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN25i" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="vMpGaXmqxS" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN25j" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -2825,7 +2825,7 @@
                                                       <node concept="2OqwBi" id="vMpGaXmqyz" role="3clFbG">
                                                         <node concept="2OqwBi" id="vMpGaXmqy$" role="2Oq$k0">
                                                           <node concept="37vLTw" id="vMpGaXmqy_" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="vMpGaXmqyD" resolve="it" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN25k" resolve="it" />
                                                           </node>
                                                           <node concept="3TrEf2" id="vMpGaXmqyA" role="2OqNvi">
                                                             <ref role="3Tt5mk" to="v7ag:5oFMniD8XPG" resolve="from" />
@@ -2839,9 +2839,9 @@
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="Rh6nW" id="vMpGaXmqyD" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="2SR9xrsN25k" role="1bW2Oz">
                                                     <property role="TrG5h" value="it" />
-                                                    <node concept="2jxLKc" id="vMpGaXmqyE" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="2SR9xrsN25l" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -2903,7 +2903,7 @@
                                           <node concept="2OqwBi" id="vMpGaXmqyY" role="3clFbG">
                                             <node concept="2OqwBi" id="vMpGaXmqyZ" role="2Oq$k0">
                                               <node concept="37vLTw" id="vMpGaXmqz0" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="vMpGaXmqz4" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN25m" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="vMpGaXmqz1" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="v7ag:5oFMniD8XPG" resolve="from" />
@@ -2917,9 +2917,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="vMpGaXmqz4" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN25m" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="vMpGaXmqz5" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN25n" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -2973,7 +2973,7 @@
                                             <node concept="2OqwBi" id="vMpGaXmqzp" role="3clFbG">
                                               <node concept="2OqwBi" id="vMpGaXmqzq" role="2Oq$k0">
                                                 <node concept="37vLTw" id="vMpGaXmqzr" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="vMpGaXmqzv" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN25o" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="vMpGaXmqzs" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="v7ag:5oFMniD8XPG" resolve="from" />
@@ -2987,9 +2987,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="vMpGaXmqzv" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN25o" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="vMpGaXmqzw" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN25p" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -3259,7 +3259,7 @@
                                             <node concept="2OqwBi" id="vMpGaXmq$W" role="3clFbG">
                                               <node concept="2OqwBi" id="vMpGaXmq$X" role="2Oq$k0">
                                                 <node concept="37vLTw" id="vMpGaXmq$Y" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="vMpGaXmq_2" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN25q" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="vMpGaXmq$Z" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="v7ag:5oFMniD8XPG" resolve="from" />
@@ -3273,9 +3273,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="vMpGaXmq_2" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN25q" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="vMpGaXmq_3" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN25r" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -3368,7 +3368,7 @@
                                               <node concept="1PxgMI" id="vMpGaXmq_I" role="2Oq$k0">
                                                 <node concept="2OqwBi" id="vMpGaXmq_J" role="1m5AlR">
                                                   <node concept="37vLTw" id="vMpGaXmq_K" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="vMpGaXmq_T" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN25s" resolve="it" />
                                                   </node>
                                                   <node concept="3TrEf2" id="vMpGaXmq_L" role="2OqNvi">
                                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -3386,7 +3386,7 @@
                                           <node concept="2OqwBi" id="vMpGaXmq_N" role="3uHU7B">
                                             <node concept="2OqwBi" id="vMpGaXmq_O" role="2Oq$k0">
                                               <node concept="37vLTw" id="vMpGaXmq_P" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="vMpGaXmq_T" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN25s" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="vMpGaXmq_Q" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -3401,9 +3401,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="vMpGaXmq_T" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN25s" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="vMpGaXmq_U" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN25t" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3990,7 +3990,7 @@
                                   <node concept="3clFbF" id="vMpGaXmqDh" role="3cqZAp">
                                     <node concept="2OqwBi" id="vMpGaXmqDi" role="3clFbG">
                                       <node concept="37vLTw" id="vMpGaXmqDj" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="vMpGaXmqDm" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN25u" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="vMpGaXmqDk" role="2OqNvi">
                                         <node concept="chp4Y" id="vMpGaXmqDl" role="cj9EB">
@@ -4000,9 +4000,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="vMpGaXmqDm" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN25u" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="vMpGaXmqDn" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN25v" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -4696,7 +4696,7 @@
                                               <node concept="1PxgMI" id="vMpGaWuw7i" role="2Oq$k0">
                                                 <node concept="2OqwBi" id="vMpGaWuw7j" role="1m5AlR">
                                                   <node concept="37vLTw" id="vMpGaWuw7k" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="vMpGaWuw7t" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN25w" resolve="it" />
                                                   </node>
                                                   <node concept="3TrEf2" id="vMpGaWuw7l" role="2OqNvi">
                                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -4714,7 +4714,7 @@
                                           <node concept="2OqwBi" id="vMpGaWuw7n" role="3uHU7B">
                                             <node concept="2OqwBi" id="vMpGaWuw7o" role="2Oq$k0">
                                               <node concept="37vLTw" id="vMpGaWuw7p" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="vMpGaWuw7t" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN25w" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="vMpGaWuw7q" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -4729,9 +4729,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="vMpGaWuw7t" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN25w" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="vMpGaWuw7u" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN25x" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -4899,7 +4899,7 @@
                         <node concept="2OqwBi" id="3qyGNHcV$uI" role="3clFbG">
                           <node concept="2OqwBi" id="3qyGNHcV$uJ" role="2Oq$k0">
                             <node concept="37vLTw" id="3qyGNHcV$uK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3qyGNHcV$uN" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN25y" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="3qyGNHcV$uL" role="2OqNvi" />
                           </node>
@@ -4909,9 +4909,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3qyGNHcV$uN" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN25y" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3qyGNHcV$uO" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN25z" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4922,7 +4922,7 @@
                     <node concept="3clFbF" id="3qyGNHcV$uS" role="3cqZAp">
                       <node concept="2OqwBi" id="3qyGNHcV$uT" role="3clFbG">
                         <node concept="37vLTw" id="3qyGNHcV$uU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3qyGNHcV$uX" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN25$" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3qyGNHcV$uV" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -4933,9 +4933,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3qyGNHcV$uX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN25$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3qyGNHcV$uY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN25_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5552,7 +5552,7 @@
                               <node concept="2OqwBi" id="5basnX1aFmr" role="3uHU7B">
                                 <node concept="2OqwBi" id="5basnX1aFms" role="2Oq$k0">
                                   <node concept="37vLTw" id="5basnX1aFmt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5basnX1aFmB" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25A" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5basnX1aFmu" role="2OqNvi">
                                     <node concept="3CFYIy" id="5basnX1aFmv" role="3CFYIz">
@@ -5565,7 +5565,7 @@
                               <node concept="2OqwBi" id="5basnX1aFmx" role="3uHU7w">
                                 <node concept="2OqwBi" id="5basnX1aFmy" role="2Oq$k0">
                                   <node concept="37vLTw" id="5basnX1aFmz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5basnX1aFmB" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25A" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5basnX1aFm$" role="2OqNvi">
                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -5580,9 +5580,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5basnX1aFmB" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN25A" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5basnX1aFmC" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN25B" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5663,7 +5663,7 @@
                               <node concept="2OqwBi" id="5basnX1aFn9" role="3uHU7B">
                                 <node concept="2OqwBi" id="5basnX1aFna" role="2Oq$k0">
                                   <node concept="37vLTw" id="5basnX1aFnb" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5basnX1aFnl" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25C" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5basnX1aFnc" role="2OqNvi">
                                     <node concept="3CFYIy" id="5basnX1aFnd" role="3CFYIz">
@@ -5676,7 +5676,7 @@
                               <node concept="2OqwBi" id="5basnX1aFnf" role="3uHU7w">
                                 <node concept="2OqwBi" id="5basnX1aFng" role="2Oq$k0">
                                   <node concept="37vLTw" id="5basnX1aFnh" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5basnX1aFnl" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25C" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5basnX1aFni" role="2OqNvi">
                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -5691,9 +5691,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5basnX1aFnl" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN25C" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5basnX1aFnm" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN25D" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5763,16 +5763,16 @@
                                 </node>
                                 <node concept="2JrnkZ" id="7g$Nqfo4SBd" role="2Oq$k0">
                                   <node concept="37vLTw" id="7g$Nqfo4NDm" role="2JrQYb">
-                                    <ref role="3cqZAo" node="2O3pA1g61r_" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25E" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2O3pA1g61r_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN25E" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2O3pA1g61rA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN25F" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5859,7 +5859,7 @@
                             <node concept="2OqwBi" id="5basnX1aFoB" role="3clFbG">
                               <node concept="2OqwBi" id="5basnX1aFoC" role="2Oq$k0">
                                 <node concept="37vLTw" id="5basnX1aFoD" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5basnX1aFoH" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN25G" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5basnX1aFoE" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -5873,9 +5873,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5basnX1aFoH" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN25G" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5basnX1aFoI" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN25H" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6163,7 +6163,7 @@
                                     </node>
                                     <node concept="2JrnkZ" id="4LFZhuY5pGW" role="2Oq$k0">
                                       <node concept="37vLTw" id="4LFZhuYgGKy" role="2JrQYb">
-                                        <ref role="3cqZAo" node="5basnX1aFqz" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN25I" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
@@ -6212,7 +6212,7 @@
                             </node>
                             <node concept="2OqwBi" id="4LFZhuY5yd8" role="3clFbw">
                               <node concept="37vLTw" id="4LFZhuY5vUu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5basnX1aFqz" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN25I" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="4LFZhuY5EjF" role="2OqNvi">
                                 <ref role="37wK5l" to="eup9:2ZUGF54jY1D" resolve="isMultiple" />
@@ -6227,7 +6227,7 @@
                               <node concept="2OqwBi" id="5basnX1aFqt" role="3uHU7B">
                                 <node concept="2OqwBi" id="5basnX1aFqu" role="2Oq$k0">
                                   <node concept="37vLTw" id="5basnX1aFqv" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5basnX1aFqz" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25I" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5basnX1aFqw" role="2OqNvi">
                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -6242,9 +6242,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5basnX1aFqz" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN25I" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5basnX1aFq$" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN25J" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6344,7 +6344,7 @@
                           <node concept="3clFbF" id="5basnX1aFrh" role="3cqZAp">
                             <node concept="2OqwBi" id="5basnX1aFri" role="3clFbG">
                               <node concept="37vLTw" id="5basnX1aFrj" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5basnX1aFrl" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN25K" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="5basnX1aFrk" role="2OqNvi">
                                 <ref role="3TsBF5" to="v7ag:3TmmsQkDl9b" resolve="abstract" />
@@ -6352,9 +6352,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5basnX1aFrl" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN25K" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5basnX1aFrm" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN25L" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -12791,7 +12791,7 @@
                                         <node concept="1PxgMI" id="4paRqaMhhrF" role="37wK5m">
                                           <node concept="2OqwBi" id="4paRqaMhhrG" role="1m5AlR">
                                             <node concept="37vLTw" id="4paRqaMhhrH" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4paRqaMhhrK" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN25M" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="4paRqaMhhrI" role="2OqNvi">
                                               <ref role="3Tt5mk" to="v7ag:71UKpntoTuF" resolve="port" />
@@ -12805,9 +12805,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4paRqaMhhrK" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN25M" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4paRqaMhhrL" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN25N" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -19234,7 +19234,7 @@
                               <node concept="3clFbF" id="4GyojwybEmA" role="3cqZAp">
                                 <node concept="2OqwBi" id="4GyojwybEmB" role="3clFbG">
                                   <node concept="37vLTw" id="4GyojwybEmC" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4GyojwybEmE" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25O" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="4GyojwybEmD" role="2OqNvi">
                                     <ref role="3TsBF5" to="v7ag:1ijJyTDpEa_" resolve="reconnectable" />
@@ -19242,9 +19242,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4GyojwybEmE" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN25O" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4GyojwybEmF" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN25P" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -19399,7 +19399,7 @@
                                     <node concept="2OqwBi" id="4mLQOETv9e7" role="3clFbG">
                                       <node concept="2OqwBi" id="4mLQOETv9e8" role="2Oq$k0">
                                         <node concept="37vLTw" id="4mLQOETv9e9" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4mLQOETv9ec" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN25Q" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="4mLQOETv9ea" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -19411,9 +19411,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4mLQOETv9ec" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN25Q" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4mLQOETv9ed" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN25R" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -19449,7 +19449,7 @@
                                     <ref role="3cqZAo" node="3yeYUb92Vbb" resolve="n" />
                                   </node>
                                   <node concept="37vLTw" id="3yeYUb92Vcd" role="3GDnbk">
-                                    <ref role="3cqZAo" node="3yeYUb92Vb6" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25S" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3clFbF" id="3yeYUb92Vcj" role="3cqZAp">
@@ -19458,9 +19458,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3yeYUb92Vb6" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN25S" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3yeYUb92Vb7" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN25T" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -19618,7 +19618,7 @@
                                     <node concept="3y3z36" id="2LSSMkCGSKZ" role="3clFbG">
                                       <node concept="2OqwBi" id="2LSSMkCGSL0" role="3uHU7B">
                                         <node concept="37vLTw" id="2LSSMkCGSL1" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2LSSMkCGSL7" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN25U" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="2LSSMkCGSL2" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:4AGl5dzwHVm" resolve="init" />
@@ -19628,9 +19628,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2LSSMkCGSL7" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN25U" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="2LSSMkCGSL8" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN25V" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -19666,7 +19666,7 @@
                                     <ref role="3cqZAo" node="2LSSMkCGSLd" resolve="n" />
                                   </node>
                                   <node concept="37vLTw" id="2LSSMkCGSLn" role="3GDnbk">
-                                    <ref role="3cqZAo" node="2LSSMkCGSLq" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN25W" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3clFbF" id="2LSSMkCGSLo" role="3cqZAp">
@@ -19675,9 +19675,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2LSSMkCGSLq" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN25W" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2LSSMkCGSLr" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN25X" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -19853,7 +19853,7 @@
                                     <node concept="3clFbF" id="6vUATgjSN6Q" role="3cqZAp">
                                       <node concept="2OqwBi" id="6vUATgjSN6R" role="3clFbG">
                                         <node concept="37vLTw" id="6vUATgjSN6S" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6vUATgjSN6U" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN25Y" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="6vUATgjSN6T" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:F_QT7XsuCu" resolve="field" />
@@ -19861,9 +19861,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="6vUATgjSN6U" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN25Y" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="6vUATgjSN6V" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN25Z" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -19876,7 +19876,7 @@
                                       <node concept="3y3z36" id="6vUATgjSN71" role="3uHU7w">
                                         <node concept="2OqwBi" id="6vUATgjSN72" role="3uHU7B">
                                           <node concept="37vLTw" id="6vUATgjSN73" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6vUATgjSN79" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN260" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="6vUATgjSN74" role="2OqNvi">
                                             <ref role="3Tt5mk" to="v7ag:4AGl5dzwHVm" resolve="init" />
@@ -19886,7 +19886,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="6vUATgjSN76" role="3uHU7B">
                                         <node concept="37vLTw" id="6vUATgjSN77" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6vUATgjSN79" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN260" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="6vUATgjSN78" role="2OqNvi">
                                           <ref role="3TsBF5" to="v7ag:F_QT7XsuBc" resolve="initField" />
@@ -19895,9 +19895,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6vUATgjSN79" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN260" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6vUATgjSN7a" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN261" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -19933,7 +19933,7 @@
                                     <ref role="3cqZAo" node="6vUATgjSN7f" resolve="n" />
                                   </node>
                                   <node concept="37vLTw" id="6vUATgjSN7p" role="3GDnbk">
-                                    <ref role="3cqZAo" node="6vUATgjSN7s" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN262" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3clFbF" id="6vUATgjSN7q" role="3cqZAp">
@@ -19942,9 +19942,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6vUATgjSN7s" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN262" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="6vUATgjSN7t" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN263" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -20399,7 +20399,7 @@
                                   <node concept="2OqwBi" id="1PvAkX2sqBg" role="3clFbG">
                                     <node concept="2OqwBi" id="1PvAkX2sqA$" role="2Oq$k0">
                                       <node concept="37vLTw" id="1PvAkX2sqAf" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1PvAkX2sqA4" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN264" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="1PvAkX2sqAM" role="2OqNvi">
                                         <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -20413,9 +20413,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1PvAkX2sqA4" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN264" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1PvAkX2sqA5" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN265" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -20455,7 +20455,7 @@
                                           <node concept="3clFbF" id="2Rv3bTUHnSj" role="3cqZAp">
                                             <node concept="2OqwBi" id="2Rv3bTUHoDB" role="3clFbG">
                                               <node concept="37vLTw" id="2Rv3bTUHnSi" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2Rv3bTUHksP" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN266" resolve="it" />
                                               </node>
                                               <node concept="2qgKlT" id="2Rv3bTUHwmc" role="2OqNvi">
                                                 <ref role="37wK5l" to="eup9:6WCyKlekwqV" resolve="requiredPorts" />
@@ -20463,9 +20463,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="2Rv3bTUHksP" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN266" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="2Rv3bTUHksQ" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN267" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -20476,7 +20476,7 @@
                                         <node concept="3clFbF" id="2Rv3bTUHH21" role="3cqZAp">
                                           <node concept="2OqwBi" id="2Rv3bTUHHLs" role="3clFbG">
                                             <node concept="37vLTw" id="2Rv3bTUHH20" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2Rv3bTUHDiT" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN268" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="2Rv3bTUHOXV" role="2OqNvi">
                                               <ref role="37wK5l" to="eup9:2ZUGF54jY1D" resolve="isMultiple" />
@@ -20484,9 +20484,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2Rv3bTUHDiT" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN268" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="2Rv3bTUHDiU" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN269" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -20506,7 +20506,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="2Rv3bTUI2OU" role="3uHU7B">
                                             <node concept="37vLTw" id="2Rv3bTUI26y" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2Rv3bTUHYo7" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN26a" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="2Rv3bTUI9GS" role="2OqNvi">
                                               <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -20515,9 +20515,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="2Rv3bTUHYo7" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN26a" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="2Rv3bTUHYo8" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN26b" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -20819,7 +20819,7 @@
                                     <node concept="2OqwBi" id="1PvAkX2sqG5" role="3clFbG">
                                       <node concept="2OqwBi" id="1PvAkX2sqFx" role="2Oq$k0">
                                         <node concept="37vLTw" id="1PvAkX2sqE_" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1PvAkX2sqEu" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN26c" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="1PvAkX2sqFF" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -20833,9 +20833,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1PvAkX2sqEu" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26c" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1PvAkX2sqEv" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26d" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -21200,7 +21200,7 @@
                                     <node concept="2OqwBi" id="6uY0cGhq1jU" role="3clFbG">
                                       <node concept="2OqwBi" id="6uY0cGhpTAy" role="2Oq$k0">
                                         <node concept="37vLTw" id="6uY0cGhpTAd" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6uY0cGhpTA5" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN26e" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="6uY0cGhq1jl" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -21214,9 +21214,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6uY0cGhpTA5" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26e" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6uY0cGhpTA6" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26f" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -21228,7 +21228,7 @@
                                   <node concept="3fqX7Q" id="1PvAkX2sIsz" role="3clFbG">
                                     <node concept="2OqwBi" id="1PvAkX2sIs$" role="3fr31v">
                                       <node concept="37vLTw" id="1PvAkX2sIs_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1PvAkX2sIsB" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN26g" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="1PvAkX2sIsA" role="2OqNvi">
                                         <ref role="37wK5l" to="eup9:2ZUGF54jY1D" resolve="isMultiple" />
@@ -21237,9 +21237,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1PvAkX2sIsB" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN26g" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1PvAkX2sIsC" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN26h" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -21656,7 +21656,7 @@
                                     <node concept="2OqwBi" id="1PvAkX2sFFf" role="3clFbG">
                                       <node concept="2OqwBi" id="1PvAkX2sFEB" role="2Oq$k0">
                                         <node concept="37vLTw" id="1PvAkX2sFEi" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1PvAkX2sFE9" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN26i" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="1PvAkX2sFEN" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -21670,9 +21670,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1PvAkX2sFE9" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26i" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1PvAkX2sFEa" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26j" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -21684,7 +21684,7 @@
                                   <node concept="3fqX7Q" id="5meTu9orooo" role="3clFbG">
                                     <node concept="2OqwBi" id="5meTu9oroop" role="3fr31v">
                                       <node concept="37vLTw" id="5meTu9orooq" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5meTu9oron0" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN26k" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="5meTu9oroor" role="2OqNvi">
                                         <ref role="37wK5l" to="eup9:2ZUGF54jY1D" resolve="isMultiple" />
@@ -21693,9 +21693,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5meTu9oron0" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN26k" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="5meTu9oron1" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN26l" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -22111,7 +22111,7 @@
                                     <node concept="2OqwBi" id="1PvAkX2sFHm" role="3clFbG">
                                       <node concept="2OqwBi" id="1PvAkX2sFGG" role="2Oq$k0">
                                         <node concept="37vLTw" id="1PvAkX2sFGn" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1PvAkX2sFGd" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN26m" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="1PvAkX2sFGT" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -22125,9 +22125,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1PvAkX2sFGd" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26m" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1PvAkX2sFGe" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26n" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -22138,7 +22138,7 @@
                                 <node concept="3clFbF" id="2ZUGF54lMGL" role="3cqZAp">
                                   <node concept="2OqwBi" id="2ZUGF54lMH7" role="3clFbG">
                                     <node concept="37vLTw" id="2ZUGF54lMGM" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2ZUGF54lMGn" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN26o" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="2ZUGF54lMH$" role="2OqNvi">
                                       <ref role="37wK5l" to="eup9:2ZUGF54jY1D" resolve="isMultiple" />
@@ -22146,9 +22146,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2ZUGF54lMGn" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN26o" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2ZUGF54lMGo" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN26p" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -22645,16 +22645,16 @@
                                       </node>
                                       <node concept="2JrnkZ" id="7g$Nqfo95EG" role="2Oq$k0">
                                         <node concept="37vLTw" id="7g$Nqfo94ui" role="2JrQYb">
-                                          <ref role="3cqZAo" node="7g$Nqfo93Zz" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN26q" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7g$Nqfo93Zz" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN26q" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7g$Nqfo93Z$" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN26r" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -22840,7 +22840,7 @@
                                     <node concept="10Nm6u" id="6hS8P3pzaD$" role="3uHU7w" />
                                     <node concept="2OqwBi" id="6hS8P3pzaAT" role="3uHU7B">
                                       <node concept="37vLTw" id="6hS8P3pzaA$" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6hS8P3pza_Y" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN26s" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6hS8P3pzaBy" role="2OqNvi">
                                         <ref role="3Tt5mk" to="v7ag:3PT6Z48LOzM" resolve="implements" />
@@ -22849,9 +22849,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6hS8P3pza_Y" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN26s" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="6hS8P3pza_Z" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN26t" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -22969,7 +22969,7 @@
                                 <node concept="2OqwBi" id="6vUATgk969G" role="3clFbG">
                                   <node concept="2OqwBi" id="6vUATgk969H" role="2Oq$k0">
                                     <node concept="37vLTw" id="6vUATgk969I" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6vUATgk969M" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN26u" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="6vUATgk969J" role="2OqNvi">
                                       <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -22983,9 +22983,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6vUATgk969M" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN26u" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6vUATgk969N" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN26v" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -23019,7 +23019,7 @@
                                 <ref role="3cqZAo" node="6vUATgk969S" resolve="n" />
                               </node>
                               <node concept="37vLTw" id="6vUATgk96a2" role="3GDnbk">
-                                <ref role="3cqZAo" node="6vUATgk96a5" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN26w" resolve="it" />
                               </node>
                             </node>
                             <node concept="3clFbF" id="6vUATgk96a3" role="3cqZAp">
@@ -23028,9 +23028,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6vUATgk96a5" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN26w" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6vUATgk96a6" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN26x" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -23228,7 +23228,7 @@
                                   <node concept="3clFbF" id="4GyojwybEl9" role="3cqZAp">
                                     <node concept="2OqwBi" id="4GyojwybElv" role="3clFbG">
                                       <node concept="37vLTw" id="4GyojwybEla" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4GyojwybEl7" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN26y" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="4GyojwybEl_" role="2OqNvi">
                                         <ref role="3TsBF5" to="v7ag:1ijJyTDpEa_" resolve="reconnectable" />
@@ -23236,9 +23236,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4GyojwybEl7" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26y" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4GyojwybEl8" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26z" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -23266,7 +23266,7 @@
                                   <node concept="3clFbF" id="4c3N3BREx0T" role="3cqZAp">
                                     <node concept="2OqwBi" id="4c3N3BREx0U" role="3clFbG">
                                       <node concept="37vLTw" id="4c3N3BREx0V" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4c3N3BREx0X" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN26$" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="4c3N3BREx0W" role="2OqNvi">
                                         <ref role="3TsBF5" to="v7ag:1ijJyTDpEa_" resolve="reconnectable" />
@@ -23274,9 +23274,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4c3N3BREx0X" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26$" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4c3N3BREx0Y" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26_" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -23341,7 +23341,7 @@
                                       <node concept="2OqwBi" id="4c3N3BRCpFF" role="3uHU7B">
                                         <node concept="2OqwBi" id="4c3N3BRCpFG" role="2Oq$k0">
                                           <node concept="37vLTw" id="4c3N3BRCpFH" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4c3N3BRCpFL" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN26A" resolve="it" />
                                           </node>
                                           <node concept="3CFZ6_" id="4c3N3BRCpFI" role="2OqNvi">
                                             <node concept="3CFYIy" id="4c3N3BRCpFJ" role="3CFYIz">
@@ -23356,7 +23356,7 @@
                                           <node concept="1PxgMI" id="4c3N3BRRi9d" role="2Oq$k0">
                                             <node concept="2OqwBi" id="4c3N3BRRi9e" role="1m5AlR">
                                               <node concept="37vLTw" id="4c3N3BRRiIZ" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4c3N3BRCpFL" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN26A" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="4c3N3BRRjXW" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -23375,9 +23375,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4c3N3BRCpFL" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26A" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4c3N3BRCpFM" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26B" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -23661,7 +23661,7 @@
                                       <node concept="2OqwBi" id="4c3N3BRCtyd" role="3uHU7B">
                                         <node concept="2OqwBi" id="4c3N3BRCtye" role="2Oq$k0">
                                           <node concept="37vLTw" id="4c3N3BRCtyf" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4c3N3BRCtyj" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN26C" resolve="it" />
                                           </node>
                                           <node concept="3CFZ6_" id="4c3N3BRCtyg" role="2OqNvi">
                                             <node concept="3CFYIy" id="4c3N3BRCtyh" role="3CFYIz">
@@ -23676,7 +23676,7 @@
                                           <node concept="1PxgMI" id="4c3N3BRRlOQ" role="2Oq$k0">
                                             <node concept="2OqwBi" id="4c3N3BRRlOR" role="1m5AlR">
                                               <node concept="37vLTw" id="4c3N3BRRlOS" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4c3N3BRCtyj" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN26C" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="4c3N3BRRlOT" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -23695,9 +23695,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4c3N3BRCtyj" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26C" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4c3N3BRCtyk" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26D" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -24305,7 +24305,7 @@
                                 <node concept="3clFbF" id="4WLtQa9fEGI" role="3cqZAp">
                                   <node concept="2OqwBi" id="4WLtQa9fEGJ" role="3clFbG">
                                     <node concept="37vLTw" id="4WLtQa9fEGK" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4WLtQa9fEGM" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN26E" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4WLtQa9fEGL" role="2OqNvi">
                                       <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -24313,9 +24313,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4WLtQa9fEGM" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN26E" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4WLtQa9fEGN" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN26F" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -26534,7 +26534,7 @@
                         <node concept="2OqwBi" id="3qyGNHcYh1$" role="3clFbG">
                           <node concept="2OqwBi" id="3qyGNHcYh1_" role="2Oq$k0">
                             <node concept="37vLTw" id="3qyGNHcYh1A" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3qyGNHcYh1D" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN26G" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="3qyGNHcYh1B" role="2OqNvi" />
                           </node>
@@ -26544,9 +26544,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3qyGNHcYh1D" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN26G" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3qyGNHcYh1E" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN26H" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -26557,7 +26557,7 @@
                     <node concept="3clFbF" id="3qyGNHcYh1I" role="3cqZAp">
                       <node concept="2OqwBi" id="3qyGNHcYh1J" role="3clFbG">
                         <node concept="37vLTw" id="3qyGNHcYh1K" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3qyGNHcYh1N" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN26I" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3qyGNHcYh1L" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -26568,9 +26568,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3qyGNHcYh1N" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN26I" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3qyGNHcYh1O" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN26J" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -28172,7 +28172,7 @@
                       <node concept="3fqX7Q" id="vMpGaW1WPt" role="3clFbG">
                         <node concept="2OqwBi" id="vMpGaW1WPv" role="3fr31v">
                           <node concept="37vLTw" id="vMpGaW1WPw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="vMpGaW1Qqa" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN26K" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="vMpGaW1WPx" role="2OqNvi">
                             <ref role="3TsBF5" to="v7ag:3TmmsQkDl9b" resolve="abstract" />
@@ -28181,9 +28181,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="vMpGaW1Qqa" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN26K" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="vMpGaW1Qqb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN26L" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -28196,7 +28196,7 @@
                       <node concept="2OqwBi" id="3KKPUg5x_Jl" role="2Oq$k0">
                         <node concept="2OqwBi" id="3KKPUg5xxbw" role="2Oq$k0">
                           <node concept="37vLTw" id="3KKPUg5xwWm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="vMpGaW20r8" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN26M" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3KKPUg5x$j1" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDnQz" resolve="body" />
@@ -28214,9 +28214,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="vMpGaW20r8" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN26M" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="vMpGaW20r9" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN26N" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -28327,7 +28327,7 @@
                           <node concept="3fqX7Q" id="4lIi55akVFL" role="3uHU7B">
                             <node concept="2OqwBi" id="4lIi55akVFN" role="3fr31v">
                               <node concept="37vLTw" id="4lIi55akVFO" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5oFMniD6FeE" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN26O" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="4lIi55akVFP" role="2OqNvi">
                                 <ref role="3TsBF5" to="v7ag:3TmmsQkDl9b" resolve="abstract" />
@@ -28337,7 +28337,7 @@
                           <node concept="2OqwBi" id="5oFMniD6FeN" role="3uHU7w">
                             <node concept="2OqwBi" id="5oFMniD6FeI" role="2Oq$k0">
                               <node concept="37vLTw" id="5oFMniD6FeH" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5oFMniD6FeE" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN26O" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5oFMniD6FeM" role="2OqNvi">
                                 <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -28352,9 +28352,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5oFMniD6FeE" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN26O" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5oFMniD6FeF" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN26P" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -28412,15 +28412,15 @@
                       <node concept="3clFbF" id="4rpFIBbWgfi" role="3cqZAp">
                         <node concept="2OqwBi" id="4rpFIBbWgnl" role="3clFbG">
                           <node concept="37vLTw" id="4rpFIBbWgfh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4rpFIBbWgbD" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN26Q" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="4rpFIBbWhQF" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4rpFIBbWgbD" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN26Q" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4rpFIBbWgbE" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN26R" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -28549,7 +28549,7 @@
                             <node concept="2OqwBi" id="4KCBE0gtLwH" role="2Oq$k0">
                               <node concept="2OqwBi" id="4KCBE0gtLwI" role="2Oq$k0">
                                 <node concept="37vLTw" id="4KCBE0gtLwJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4KCBE0gtoDC" resolve="instance" />
+                                  <ref role="3cqZAo" node="2SR9xrsN26Y" resolve="instance" />
                                 </node>
                                 <node concept="3TrEf2" id="4KCBE0gtLwK" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -28566,7 +28566,7 @@
                                     <node concept="2OqwBi" id="4KCBE0gtLwQ" role="3clFbG">
                                       <node concept="2OqwBi" id="4KCBE0gtLwR" role="2Oq$k0">
                                         <node concept="37vLTw" id="4KCBE0gtLwS" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4KCBE0gtLwW" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN26S" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="4KCBE0gtLwT" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -28580,9 +28580,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4KCBE0gtLwW" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN26S" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4KCBE0gtLwX" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN26T" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -28593,7 +28593,7 @@
                                 <node concept="3clFbF" id="4KCBE0gtLx1" role="3cqZAp">
                                   <node concept="2OqwBi" id="4KCBE0gtLx2" role="3clFbG">
                                     <node concept="37vLTw" id="4KCBE0gtLx3" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4KCBE0gtLx5" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN26U" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="4KCBE0gtLx4" role="2OqNvi">
                                       <ref role="37wK5l" to="eup9:2ZUGF54jY1D" resolve="isMultiple" />
@@ -28601,9 +28601,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4KCBE0gtLx5" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN26U" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4KCBE0gtLx6" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN26V" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -28625,7 +28625,7 @@
                               </node>
                               <node concept="2OqwBi" id="4KCBE0gtLxe" role="33vP2m">
                                 <node concept="37vLTw" id="4KCBE0gtLxf" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4KCBE0gtoDC" resolve="instance" />
+                                  <ref role="3cqZAo" node="2SR9xrsN26Y" resolve="instance" />
                                 </node>
                                 <node concept="2qgKlT" id="4KCBE0gtLxg" role="2OqNvi">
                                   <ref role="37wK5l" to="eup9:2ZUGF54lpvh" resolve="getMultiConnectedInstanceAndProvidedPort" />
@@ -28851,7 +28851,7 @@
                                             </node>
                                             <node concept="2JrnkZ" id="6wa9dmqGGYb" role="2Oq$k0">
                                               <node concept="37vLTw" id="6xoo5Uh8SS4" role="2JrQYb">
-                                                <ref role="3cqZAo" node="6xoo5Uh8OJ1" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN26W" resolve="it" />
                                               </node>
                                             </node>
                                           </node>
@@ -28879,7 +28879,7 @@
                                             </node>
                                             <node concept="2JrnkZ" id="7g$NqfnYN5Y" role="2Oq$k0">
                                               <node concept="37vLTw" id="6xoo5Uh8UFI" role="2JrQYb">
-                                                <ref role="3cqZAo" node="6xoo5Uh8OJ1" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN26W" resolve="it" />
                                               </node>
                                             </node>
                                           </node>
@@ -28903,9 +28903,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="6xoo5Uh8OJ1" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN26W" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="6xoo5Uh8OJ2" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN26X" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -28914,9 +28914,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4KCBE0gtoDC" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN26Y" role="1bW2Oz">
                       <property role="TrG5h" value="instance" />
-                      <node concept="2jxLKc" id="4KCBE0gtoDD" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN26Z" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -29078,7 +29078,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="5hO4USfgy49" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5hO4USfgy55" resolve="comp" />
+                            <ref role="3cqZAo" node="2SR9xrsN278" resolve="comp" />
                           </node>
                         </node>
                         <node concept="3zZkjj" id="5hO4USfgy4a" role="2OqNvi">
@@ -29091,7 +29091,7 @@
                                       <node concept="2OqwBi" id="5hO4USfgy4h" role="2Oq$k0">
                                         <node concept="2OqwBi" id="5hO4USfgy4i" role="2Oq$k0">
                                           <node concept="37vLTw" id="5hO4USfgy4j" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5hO4USfgy4w" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN270" resolve="it" />
                                           </node>
                                           <node concept="2Xjw5R" id="5hO4USfgy4k" role="2OqNvi">
                                             <node concept="1xMEDy" id="5hO4USfgy4l" role="1xVPHs">
@@ -29117,7 +29117,7 @@
                                       <node concept="2OqwBi" id="4c3N3BQIGQX" role="2Oq$k0">
                                         <node concept="2OqwBi" id="4c3N3BQI$94" role="2Oq$k0">
                                           <node concept="37vLTw" id="4c3N3BQIz2j" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5hO4USfgy4w" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN270" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4c3N3BQI_EU" role="2OqNvi">
                                             <ref role="3Tt5mk" to="v7ag:71UKpntoTuF" resolve="port" />
@@ -29136,7 +29136,7 @@
                                     <node concept="2OqwBi" id="5hO4USfgy4q" role="3uHU7B">
                                       <node concept="2OqwBi" id="5hO4USfgy4r" role="2Oq$k0">
                                         <node concept="37vLTw" id="5hO4USfgy4s" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5hO4USfgy4w" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN270" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="5hO4USfgy4t" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:71UKpntoTuF" resolve="port" />
@@ -29152,9 +29152,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5hO4USfgy4w" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN270" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5hO4USfgy4x" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN271" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -29174,7 +29174,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="5hO4USfgy4F" role="1m5AlR">
                                       <node concept="37vLTw" id="5hO4USfgy4G" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5hO4USfgy4I" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN272" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="5hO4USfgy4H" role="2OqNvi">
                                         <ref role="3Tt5mk" to="v7ag:71UKpntoTuF" resolve="port" />
@@ -29185,9 +29185,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5hO4USfgy4I" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN272" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5hO4USfgy4J" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN273" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -29233,7 +29233,7 @@
                       <node concept="2OqwBi" id="4c3N3BQIjyA" role="2Oq$k0">
                         <node concept="2OqwBi" id="5hO4USfgy4O" role="2Oq$k0">
                           <node concept="37vLTw" id="5hO4USfgy4P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5hO4USfgy55" resolve="comp" />
+                            <ref role="3cqZAo" node="2SR9xrsN278" resolve="comp" />
                           </node>
                           <node concept="2Rf3mk" id="5hO4USfgy4Q" role="2OqNvi">
                             <node concept="1xMEDy" id="5hO4USfgy4R" role="1xVPHs">
@@ -29251,7 +29251,7 @@
                                   <node concept="2OqwBi" id="4c3N3BQIU6_" role="2Oq$k0">
                                     <node concept="2OqwBi" id="4c3N3BQIPKX" role="2Oq$k0">
                                       <node concept="37vLTw" id="4c3N3BQIO$q" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4c3N3BQIpId" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN274" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4c3N3BQIRGh" role="2OqNvi">
                                         <ref role="3Tt5mk" to="v7ag:3yeYUb95GHe" resolve="providedPort" />
@@ -29269,9 +29269,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4c3N3BQIpId" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN274" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4c3N3BQIpIe" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN275" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -29287,7 +29287,7 @@
                                 <node concept="TSZUe" id="5hO4USfgy4Z" role="2OqNvi">
                                   <node concept="2OqwBi" id="5hO4USfgy50" role="25WWJ7">
                                     <node concept="37vLTw" id="5hO4USfgy51" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5hO4USfgy53" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN276" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5hO4USfgy52" role="2OqNvi">
                                       <ref role="3Tt5mk" to="v7ag:3yeYUb95GHe" resolve="providedPort" />
@@ -29297,18 +29297,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5hO4USfgy53" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN276" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5hO4USfgy54" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN277" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5hO4USfgy55" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN278" role="1bW2Oz">
                   <property role="TrG5h" value="comp" />
-                  <node concept="2jxLKc" id="5hO4USfgy56" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN279" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -29336,15 +29336,15 @@
                       </node>
                       <node concept="2JrnkZ" id="7g$Nqfo4EDa" role="2Oq$k0">
                         <node concept="37vLTw" id="7g$Nqfo4EhL" role="2JrQYb">
-                          <ref role="3cqZAo" node="6Q2bzfCgcsx" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27a" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Q2bzfCgcsx" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN27a" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Q2bzfCgcsy" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN27b" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/behavior.mps
index eac8dd4352c..b7f12eafafd 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/behavior.mps
@@ -65,7 +65,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -91,7 +91,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/constraints.mps
index 8d0219ffb40..a06577b5d3e 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/constraints.mps
@@ -64,7 +64,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -121,7 +121,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/editor.mps
index 18e1e124b38..412fee7e75c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/editor.mps
@@ -50,7 +50,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/migration.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/migration.mps
index b6e968b4464..85a286d3ed2 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -78,7 +78,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -91,7 +91,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -144,7 +144,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/structure.mps
index 9c3d2850e39..4dcae9d2e65 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/structure.mps
@@ -53,7 +53,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/typesystem.mps
index e57b94f8737..881061005e2 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/languageModels/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:1ff0a2e1-cb01-42b4-88e2-1a5bc0b655f8(com.mbeddr.ext.components.gen_nomw.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
@@ -77,7 +77,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,6 +93,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -145,7 +146,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -174,7 +175,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -293,7 +293,7 @@
                         <node concept="3clFbF" id="7OvXfhzPDJY" role="3cqZAp">
                           <node concept="2OqwBi" id="7OvXfhzPDJZ" role="3clFbG">
                             <node concept="37vLTw" id="7OvXfhzPDK0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7OvXfhzPDK2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN24I" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7OvXfhzPDK1" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -301,9 +301,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7OvXfhzPDK2" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN24I" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7OvXfhzPDK3" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN24J" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -342,7 +342,7 @@
                               </node>
                               <node concept="2OqwBi" id="7OvXfhzPDKp" role="3uHU7B">
                                 <node concept="37vLTw" id="7OvXfhzPDKq" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7OvXfhzPDKs" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN24K" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7OvXfhzPDKr" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -351,9 +351,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7OvXfhzPDKs" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN24K" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7OvXfhzPDKt" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN24L" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -697,7 +697,7 @@
                                       <node concept="3cpWs3" id="7OvXfhzQCIP" role="3clFbG">
                                         <node concept="2OqwBi" id="7OvXfhzQCIl" role="3uHU7w">
                                           <node concept="37vLTw" id="7OvXfhzQCIk" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7OvXfhzQBSu" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN24M" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="7OvXfhzQCIp" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -718,9 +718,9 @@
                                     <property role="TrG5h" value="st" />
                                     <node concept="17QB3L" id="7OvXfhzQCHZ" role="1tU5fm" />
                                   </node>
-                                  <node concept="Rh6nW" id="7OvXfhzQBSu" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN24M" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="7OvXfhzQBSv" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN24N" role="1tU5fm" />
                                   </node>
                                 </node>
                                 <node concept="2OqwBi" id="7OvXfhzQCHS" role="1MDeny">
@@ -827,7 +827,7 @@
                                             <node concept="3cpWs3" id="7OvXfhzQCYC" role="3clFbG">
                                               <node concept="2OqwBi" id="7OvXfhzQCYD" role="3uHU7w">
                                                 <node concept="37vLTw" id="7OvXfhzQCYE" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="7OvXfhzQCYL" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN24O" resolve="it" />
                                                 </node>
                                                 <node concept="3TrcHB" id="7OvXfhzQCYF" role="2OqNvi">
                                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -848,9 +848,9 @@
                                           <property role="TrG5h" value="st" />
                                           <node concept="17QB3L" id="7OvXfhzQCYK" role="1tU5fm" />
                                         </node>
-                                        <node concept="Rh6nW" id="7OvXfhzQCYL" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN24O" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="7OvXfhzQCYM" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN24P" role="1tU5fm" />
                                         </node>
                                       </node>
                                       <node concept="2OqwBi" id="7OvXfhzQCYN" role="1MDeny">
@@ -917,7 +917,7 @@
                     <node concept="3clFbF" id="1ijJyTDr48u" role="3cqZAp">
                       <node concept="2OqwBi" id="1ijJyTDr48v" role="3clFbG">
                         <node concept="37vLTw" id="1ijJyTDrdhB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1ijJyTDr48y" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN24Q" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="1ijJyTDr48_" role="2OqNvi">
                           <ref role="3TsBF5" to="v7ag:1ijJyTDpEa_" resolve="reconnectable" />
@@ -925,9 +925,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1ijJyTDr48y" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN24Q" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1ijJyTDr48z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN24R" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/generator/template/main@generator.mps
index 036ef09c739..6a7d7389feb 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/generator/template/main@generator.mps
@@ -87,7 +87,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -115,7 +115,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -175,7 +175,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -216,6 +216,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -295,20 +296,20 @@
       <concept id="1217282130234" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputModel" flags="nn" index="1FEO0x" />
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ng" index="2vgHxx">
+      <concept id="2688792604368329409" name="com.mbeddr.core.modules.structure.ICodeLocationAware" flags="ngI" index="2vgHxx">
         <property id="2688792604368329410" name="overriddenCodeLocation" index="2vgHxy" />
       </concept>
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -396,7 +397,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -438,11 +439,11 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -462,7 +463,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
@@ -506,7 +507,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1205598340672" name="jetbrains.mps.baseLanguage.collections.structure.DisjunctOperation" flags="nn" index="2NgGto" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -2541,7 +2541,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="4jc_TWT4gHh" role="3uHU7B">
                                       <node concept="37vLTw" id="4jc_TWT4gHg" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4jc_TWT4gHd" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN27t" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4jc_TWT4gHl" role="2OqNvi">
                                         <ref role="3Tt5mk" to="mxvz:4jc_TWT380Q" resolve="op" />
@@ -2550,9 +2550,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4jc_TWT4gHd" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN27t" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4jc_TWT4gHe" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN27u" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2771,7 +2771,7 @@
                             <node concept="2OqwBi" id="1Rr52SX$70_" role="3clFbG">
                               <node concept="2OqwBi" id="1Rr52SX$70q" role="2Oq$k0">
                                 <node concept="37vLTw" id="1Rr52SX$70p" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1Rr52SX$70j" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN27v" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1Rr52SX$70x" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -2785,9 +2785,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1Rr52SX$70j" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN27v" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1Rr52SX$70k" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN27w" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2866,7 +2866,7 @@
                                       <ref role="3cqZAo" node="7ee7PEvaZTO" resolve="n" />
                                     </node>
                                     <node concept="37vLTw" id="7ee7PEvaZU0" role="3GDnbk">
-                                      <ref role="3cqZAo" node="7ee7PEvaZTp" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN27x" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="3GDn8_" id="7ee7PEvaZU1" role="3cqZAp">
@@ -2882,9 +2882,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="7ee7PEvaZTp" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN27x" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7ee7PEvaZTq" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN27y" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -4650,7 +4650,7 @@
                                       <node concept="2OqwBi" id="5vll4VdwkY3" role="3clFbG">
                                         <node concept="2OqwBi" id="5vll4VdwkXC" role="2Oq$k0">
                                           <node concept="37vLTw" id="5vll4VdwkXj" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5vll4VdwkXg" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN27z" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="5vll4VdwkXH" role="2OqNvi">
                                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -4664,9 +4664,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5vll4VdwkXg" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN27z" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5vll4VdwkXh" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN27$" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/behavior.mps
index 25feef93fe6..89800f8852c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/behavior.mps
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:500efa65-8ecd-4074-9bcc-6e14384fa05d(com.mbeddr.ext.components.mock.behavior)">
   <persistence version="9" />
-  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
@@ -192,6 +191,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -276,7 +276,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -462,7 +461,7 @@
                     <node concept="3clFbF" id="3Krj9ItjBqF" role="3cqZAp">
                       <node concept="2OqwBi" id="3Krj9ItjBqH" role="3clFbG">
                         <node concept="37vLTw" id="3Krj9ItjBqG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3Krj9ItjBqD" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27c" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3Krj9ItjBqL" role="2OqNvi">
                           <node concept="chp4Y" id="3Krj9ItjBqN" role="cj9EA">
@@ -472,9 +471,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3Krj9ItjBqD" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN27c" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3Krj9ItjBqE" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN27d" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -890,7 +889,7 @@
                       <node concept="3y3z36" id="7$_eEdIcwEO" role="3uHU7B">
                         <node concept="2OqwBi" id="7$_eEdIcwEP" role="3uHU7B">
                           <node concept="37vLTw" id="7$_eEdIcwF7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7$_eEdIcwFu" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN27e" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7$_eEdIcwER" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -901,7 +900,7 @@
                       <node concept="2OqwBi" id="7$_eEdIcwET" role="3uHU7w">
                         <node concept="2OqwBi" id="7$_eEdIcwEU" role="2Oq$k0">
                           <node concept="37vLTw" id="7$_eEdIcwF8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7$_eEdIcwFu" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN27e" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7$_eEdIcwEW" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -916,9 +915,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7$_eEdIcwFu" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN27e" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7$_eEdIcwFv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN27f" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/constraints.mps
index 780ac6124a0..93dc7136068 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/constraints.mps
@@ -64,7 +64,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -96,6 +96,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -150,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -158,7 +159,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
     </language>
   </registry>
@@ -424,7 +424,7 @@
                       <node concept="3clFbF" id="5CkU_dHinhJ" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHinhK" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHinhL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHinhN" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN27g" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="5CkU_dHinhM" role="2OqNvi">
                             <ref role="37wK5l" to="eup9:6JVEnxIhC2$" resolve="instances" />
@@ -432,9 +432,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHinhN" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN27g" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHinhO" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN27h" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/editor.mps
index 20573ce785f..34e6541aaed 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/editor.mps
@@ -55,7 +55,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -76,7 +76,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -132,7 +132,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/intentions.mps
index fcb1c6341a0..c96c08cff3c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/intentions.mps
@@ -68,7 +68,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/scripts.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/scripts.mps
index 9032b264160..3868c17c6e8 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/scripts.mps
@@ -70,7 +70,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/typesystem.mps
index 31fed4f62bb..9e14bc02276 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/languageModels/typesystem.mps
@@ -76,7 +76,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -88,6 +88,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -206,7 +207,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -229,7 +230,6 @@
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -366,7 +366,7 @@
                     <node concept="3clFbF" id="4jc_TWT3bSH" role="3cqZAp">
                       <node concept="2OqwBi" id="4jc_TWT3bSJ" role="3clFbG">
                         <node concept="37vLTw" id="4jc_TWT3bSI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4jc_TWT3bSF" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27i" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4jc_TWT3bSN" role="2OqNvi">
                           <node concept="chp4Y" id="4jc_TWT3bSP" role="cj9EA">
@@ -376,9 +376,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4jc_TWT3bSF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN27i" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4jc_TWT3bSG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN27j" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -702,7 +702,7 @@
                           <node concept="2OqwBi" id="5vll4VdvQKK" role="3clFbG">
                             <node concept="2OqwBi" id="5vll4VdvQKL" role="2Oq$k0">
                               <node concept="37vLTw" id="5vll4VdvQKM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5vll4VdvQKQ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN27k" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5vll4VdvQKN" role="2OqNvi">
                                 <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -716,9 +716,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5vll4VdvQKQ" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN27k" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5vll4VdvQKR" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN27l" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -792,7 +792,7 @@
                       <node concept="2OqwBi" id="5vll4VdwmqH" role="3clFbG">
                         <node concept="2OqwBi" id="5vll4Vdwmqi" role="2Oq$k0">
                           <node concept="37vLTw" id="5vll4VdwmpX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5vll4VdwmpU" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN27m" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5vll4Vdwmqn" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -806,9 +806,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5vll4VdwmpU" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN27m" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5vll4VdwmpV" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN27n" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1073,7 +1073,7 @@
                       <node concept="3fqX7Q" id="7B2EFmbXlA4" role="3uHU7B">
                         <node concept="2OqwBi" id="7B2EFmbXlAr" role="3fr31v">
                           <node concept="37vLTw" id="7B2EFmbXlA6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7OITQieW0bi" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN27o" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="7B2EFmbXtjb" role="2OqNvi">
                             <node concept="chp4Y" id="7B2EFmbXtjd" role="cj9EA">
@@ -1085,7 +1085,7 @@
                       <node concept="3fqX7Q" id="7OITQieW0bd" role="3uHU7w">
                         <node concept="2OqwBi" id="7OITQieW0be" role="3fr31v">
                           <node concept="37vLTw" id="7OITQieW0bf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7OITQieW0bi" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN27o" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="7OITQieW0bg" role="2OqNvi">
                             <node concept="chp4Y" id="7OITQieW0bh" role="cj9EA">
@@ -1098,7 +1098,7 @@
                     <node concept="3fqX7Q" id="7OITQieW0b8" role="3uHU7w">
                       <node concept="2OqwBi" id="7OITQieW0b9" role="3fr31v">
                         <node concept="37vLTw" id="7OITQieW0ba" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7OITQieW0bi" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27o" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="7OITQieW0bb" role="2OqNvi">
                           <node concept="chp4Y" id="7OITQieW0bc" role="cj9EA">
@@ -1110,9 +1110,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="7OITQieW0bi" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN27o" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="7OITQieW0bj" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN27p" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1174,7 +1174,7 @@
                 <node concept="3clFbF" id="7OITQieW62s" role="3cqZAp">
                   <node concept="2OqwBi" id="7OITQieW62M" role="3clFbG">
                     <node concept="37vLTw" id="7OITQieW62t" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7OITQieW62q" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN27q" resolve="it" />
                     </node>
                     <node concept="1mIQ4w" id="7OITQieW62W" role="2OqNvi">
                       <node concept="chp4Y" id="7OITQieW62Y" role="cj9EA">
@@ -1184,9 +1184,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="7OITQieW62q" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN27q" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="7OITQieW62r" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN27r" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl
index cfda4466d47..0589ecfa546 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl
@@ -52,7 +52,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -143,7 +143,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -162,7 +161,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/generator/template/main@generator.mps
index 1d0cdbccd98..515fbf14d86 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/generator/template/main@generator.mps
@@ -110,7 +110,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -139,7 +139,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -206,7 +206,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
@@ -275,6 +275,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -327,14 +328,14 @@
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -466,7 +467,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -518,7 +519,7 @@
         <child id="9184727592626165252" name="content" index="1igach" />
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -536,7 +537,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
@@ -564,7 +565,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -604,7 +604,7 @@
                           <node concept="3fqX7Q" id="4WcLiIfX08q" role="3uHU7B">
                             <node concept="2OqwBi" id="4WcLiIfX08s" role="3fr31v">
                               <node concept="37vLTw" id="4WcLiIfX08t" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4WcLiIgk1fn" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN27M" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="4WcLiIfX08u" role="2OqNvi">
                                 <node concept="chp4Y" id="4WcLiIfX08v" role="cj9EA">
@@ -620,7 +620,7 @@
                                   <ref role="cht4Q" to="clqz:47Sr75PmDA0" resolve="EntryAction" />
                                 </node>
                                 <node concept="37vLTw" id="4WcLiIfYcam" role="1m5AlR">
-                                  <ref role="3cqZAo" node="4WcLiIgk1fn" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN27M" resolve="it" />
                                 </node>
                               </node>
                               <node concept="2qgKlT" id="4WcLiIfYcan" role="2OqNvi">
@@ -631,9 +631,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4WcLiIgk1fn" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN27M" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4WcLiIgk1fo" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN27N" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1483,7 +1483,7 @@
                                           <node concept="2OqwBi" id="53ULra2CAO6" role="33vP2m">
                                             <node concept="2OqwBi" id="53ULra2Cz$o" role="2Oq$k0">
                                               <node concept="37vLTw" id="53ULra2CERm" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5yVrpGZDmhf" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN27O" resolve="it" />
                                               </node>
                                               <node concept="2Rf3mk" id="53ULra2Cz$s" role="2OqNvi">
                                                 <node concept="1xMEDy" id="53ULra2Cz$t" role="1xVPHs">
@@ -1565,9 +1565,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="5yVrpGZDmhf" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN27O" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="5yVrpGZDmhg" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN27P" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3798,7 +3798,7 @@
                                   <node concept="10Nm6u" id="KU5KLY1NlH" role="3uHU7w" />
                                   <node concept="2OqwBi" id="KU5KLY1NlI" role="3uHU7B">
                                     <node concept="37vLTw" id="KU5KLY1NlJ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="KU5KLY1NlL" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN27Q" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="KU5KLY1NlK" role="2OqNvi">
                                       <ref role="3Tt5mk" to="clqz:41KMvfcjBF$" resolve="init" />
@@ -3807,9 +3807,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="KU5KLY1NlL" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN27Q" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="KU5KLY1NlM" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN27R" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -4377,7 +4377,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="1erouHqJc3P" role="33vP2m">
                                         <node concept="37vLTw" id="1erouHqJc3Q" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1erouHqJc44" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN27S" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="1erouHqJc3R" role="2OqNvi">
                                           <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -4418,9 +4418,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1erouHqJc44" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN27S" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1erouHqJc45" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN27T" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -4718,7 +4718,7 @@
                         <node concept="2OqwBi" id="3U_nJP1wR1V" role="3clFbG">
                           <node concept="2OqwBi" id="3U_nJP1wR1W" role="2Oq$k0">
                             <node concept="37vLTw" id="3U_nJP1wR1X" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3U_nJP1wR23" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN27U" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3U_nJP1wR1Y" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4736,9 +4736,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3U_nJP1wR23" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN27U" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3U_nJP1wR24" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN27V" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5051,7 +5051,7 @@
                           <node concept="2OqwBi" id="4otgCcW3D43" role="37vLTJ">
                             <node concept="2OqwBi" id="4otgCcW3AEx" role="2Oq$k0">
                               <node concept="37vLTw" id="4otgCcW3A_p" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4otgCcW3zVb" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN27W" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="4otgCcW3CuP" role="2OqNvi">
                                 <ref role="3Tt5mk" to="8yj6:7wVKixdVVsm" resolve="machine" />
@@ -5067,7 +5067,7 @@
                     <node concept="2OqwBi" id="4otgCcW3_hk" role="3clFbw">
                       <node concept="2OqwBi" id="4otgCcW3$8P" role="2Oq$k0">
                         <node concept="37vLTw" id="4otgCcW3$0O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4otgCcW3zVb" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27W" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="4otgCcW3_0G" role="2OqNvi">
                           <node concept="1xMEDy" id="4otgCcW3_0I" role="1xVPHs">
@@ -5083,9 +5083,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4otgCcW3zVb" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN27W" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4otgCcW3zVc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN27X" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/actions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/actions.mps
index dfd446307de..26bfa3e3b94 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/actions.mps
@@ -72,7 +72,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/com.mbeddr.ext.components.statemachine.intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/com.mbeddr.ext.components.statemachine.intentions.mps
index 3a66c1e78cc..a601926c938 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/com.mbeddr.ext.components.statemachine.intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/com.mbeddr.ext.components.statemachine.intentions.mps
@@ -63,7 +63,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,6 +79,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -161,7 +162,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -172,7 +173,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -309,7 +309,7 @@
                                     <node concept="WxPPo" id="59cfP9u9Epe" role="28ntcv">
                                       <node concept="2OqwBi" id="3TJMuII9cjz" role="WxPPp">
                                         <node concept="37vLTw" id="3TJMuII9cj$" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3TJMuII9cjH" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN27D" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="3TJMuII9cj_" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -323,7 +323,7 @@
                                       <node concept="2OqwBi" id="3TJMuII9cjC" role="36biLW">
                                         <node concept="2OqwBi" id="3TJMuII9cjD" role="2Oq$k0">
                                           <node concept="37vLTw" id="3TJMuII9cjE" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3TJMuII9cjH" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN27D" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="3TJMuII9cjF" role="2OqNvi">
                                             <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -337,9 +337,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3TJMuII9cjH" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN27D" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3TJMuII9cjI" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN27E" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/constraints.mps
index a119e087b39..c0947a3afb2 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/constraints.mps
@@ -39,7 +39,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -73,6 +73,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -110,7 +111,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -118,7 +119,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -192,7 +192,7 @@
                           <node concept="10Nm6u" id="5CkU_dHinwu" role="3uHU7w" />
                           <node concept="2OqwBi" id="5CkU_dHinwv" role="3uHU7B">
                             <node concept="37vLTw" id="5CkU_dHinww" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHinwy" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN27_" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5CkU_dHinwx" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -201,9 +201,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHinwy" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN27_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHinwz" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN27A" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -247,7 +247,7 @@
                         <node concept="2OqwBi" id="5CkU_dHinCY" role="3clFbG">
                           <node concept="2OqwBi" id="5CkU_dHinCZ" role="2Oq$k0">
                             <node concept="37vLTw" id="5CkU_dHinD0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHinD4" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN27B" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5CkU_dHinD1" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -261,9 +261,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHinD4" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN27B" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHinD5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN27C" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/editor.mps
index f01a87666a4..f0783f66964 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/editor.mps
@@ -24,7 +24,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -40,7 +40,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/typesystem.mps
index 54d64daf813..e4b85d28efa 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/languageModels/typesystem.mps
@@ -81,7 +81,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,6 +93,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -210,7 +211,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -230,7 +231,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -443,7 +443,7 @@
                     <node concept="2OqwBi" id="7EEuXpJqnRf" role="3uHU7w">
                       <node concept="2OqwBi" id="7EEuXpJqmIB" role="2Oq$k0">
                         <node concept="37vLTw" id="7EEuXpJqmkF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7EEuXpJqjTU" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27F" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7EEuXpJqnn5" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:7EEuXpIA8et" resolve="failureHandler" />
@@ -454,7 +454,7 @@
                     <node concept="17R0WA" id="7EEuXpJqlsP" role="3uHU7B">
                       <node concept="2OqwBi" id="7EEuXpJqkkt" role="3uHU7B">
                         <node concept="37vLTw" id="7EEuXpJqjXA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7EEuXpJqjTU" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27F" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7EEuXpJqkU5" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:7BISmlsIlB1" resolve="event" />
@@ -467,9 +467,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="7EEuXpJqjTU" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN27F" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="7EEuXpJqjTV" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN27G" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -675,7 +675,7 @@
                         </node>
                         <node concept="2OqwBi" id="3U_nJP1D1UK" role="33vP2m">
                           <node concept="37vLTw" id="3U_nJP1D1UL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3U_nJP1CnBK" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN27H" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3U_nJP1D1UM" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -716,9 +716,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3U_nJP1CnBK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN27H" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3U_nJP1CnBL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN27I" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -929,7 +929,7 @@
                     <node concept="2OqwBi" id="53ULr9ZZlUW" role="3uHU7w">
                       <node concept="2OqwBi" id="53ULr9ZZlUX" role="2Oq$k0">
                         <node concept="37vLTw" id="53ULr9ZZlUY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="53ULr9ZZlV5" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27J" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="53ULr9ZZlUZ" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:7EEuXpIA8et" resolve="failureHandler" />
@@ -940,7 +940,7 @@
                     <node concept="17R0WA" id="53ULr9ZZlV1" role="3uHU7B">
                       <node concept="2OqwBi" id="53ULr9ZZlV2" role="3uHU7B">
                         <node concept="37vLTw" id="53ULr9ZZlV3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="53ULr9ZZlV5" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN27J" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="53ULr9ZZlV4" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:7BISmlsIlB1" resolve="event" />
@@ -953,9 +953,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="53ULr9ZZlV5" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN27J" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="53ULr9ZZlV6" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN27K" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl
index 50aa780dbce..d5b89dec7a2 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl
@@ -54,7 +54,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -126,7 +126,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_together">
@@ -200,7 +199,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</dependency>
@@ -214,7 +212,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/generator/template/com/mbeddr/ext/components/test/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/generator/template/com/mbeddr/ext/components/test/generator/template/main@generator.mps
index c15cdbd7259..df0e37d7c7b 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/generator/template/com/mbeddr/ext/components/test/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/generator/template/com/mbeddr/ext/components/test/generator/template/main@generator.mps
@@ -166,6 +166,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -297,7 +298,6 @@
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -790,7 +790,7 @@
                         <node concept="2OqwBi" id="3qyGNHcV$uI" role="3clFbG">
                           <node concept="2OqwBi" id="3qyGNHcV$uJ" role="2Oq$k0">
                             <node concept="37vLTw" id="3qyGNHcV$uK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3qyGNHcV$uN" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN281" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="3qyGNHcV$uL" role="2OqNvi" />
                           </node>
@@ -800,9 +800,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3qyGNHcV$uN" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN281" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3qyGNHcV$uO" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN282" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -813,7 +813,7 @@
                     <node concept="3clFbF" id="3qyGNHcV$uS" role="3cqZAp">
                       <node concept="2OqwBi" id="3qyGNHcV$uT" role="3clFbG">
                         <node concept="37vLTw" id="3qyGNHcV$uU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3qyGNHcV$uX" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN283" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3qyGNHcV$uV" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -824,9 +824,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3qyGNHcV$uX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN283" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3qyGNHcV$uY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN284" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -938,7 +938,7 @@
                         <node concept="10Nm6u" id="eSkzRgLx3j" role="3uHU7w" />
                         <node concept="2OqwBi" id="eSkzRgLx2K" role="3uHU7B">
                           <node concept="37vLTw" id="eSkzRgLx2r" role="2Oq$k0">
-                            <ref role="3cqZAo" node="eSkzRgLx2o" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN285" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="eSkzRgLx2Q" role="2OqNvi">
                             <node concept="3CFYIy" id="eSkzRgLx2U" role="3CFYIz">
@@ -949,9 +949,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="eSkzRgLx2o" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN285" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="eSkzRgLx2p" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN286" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -963,7 +963,7 @@
                     <node concept="2OqwBi" id="eSkzRgLx4A" role="3clFbG">
                       <node concept="2OqwBi" id="eSkzRgLx4a" role="2Oq$k0">
                         <node concept="37vLTw" id="eSkzRgLx3P" role="2Oq$k0">
-                          <ref role="3cqZAo" node="eSkzRgLx3M" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN287" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="eSkzRgLx4g" role="2OqNvi">
                           <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
@@ -993,7 +993,7 @@
                               <node concept="2OqwBi" id="5hYHEwYlGUd" role="1snq_E">
                                 <node concept="2OqwBi" id="5hYHEwYl_Ci" role="2Oq$k0">
                                   <node concept="37vLTw" id="5hYHEwYlzxx" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="eSkzRgLx3M" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN287" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5hYHEwYlFg8" role="2OqNvi">
                                     <node concept="3CFYIy" id="5hYHEwYlG3s" role="3CFYIz">
@@ -1012,9 +1012,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="eSkzRgLx3M" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN287" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="eSkzRgLx3N" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN288" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/constraints.mps
index 367601aa4e9..7e6a3b9fc18 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/constraints.mps
@@ -47,7 +47,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -70,6 +70,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -89,7 +90,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -97,7 +98,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -155,7 +155,7 @@
                         <node concept="2OqwBi" id="5CkU_dHinPt" role="3clFbG">
                           <node concept="2OqwBi" id="5CkU_dHinPu" role="2Oq$k0">
                             <node concept="37vLTw" id="5CkU_dHinPv" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHinPz" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN27Y" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="5CkU_dHinPw" role="2OqNvi">
                               <node concept="3CFYIy" id="5CkU_dHinPx" role="3CFYIz">
@@ -167,9 +167,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHinPz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN27Y" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHinP$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN27Z" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/editor.mps
index 6de624d0bdd..6aca05d7015 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/editor.mps
@@ -39,7 +39,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -59,7 +59,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/typesystem.mps
index 12f27fdb6d0..aa972fff61d 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/languageModels/typesystem.mps
@@ -101,7 +101,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl
index 572fe5d9b4a..0acfddaf4b0 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl
@@ -62,7 +62,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -139,7 +139,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_together">
@@ -173,7 +172,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
   </dependencies>
@@ -181,7 +179,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -260,7 +258,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>06d68b77-b699-4918-83b8-857e63787800(com.mbeddr.core.unittest)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl
index 9a9ae2b5775..dd4c4856554 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl
@@ -43,7 +43,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -108,12 +108,10 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0d04a6cc-773e-4069-b9b0-11884b2ff1c8(com.mbeddr.ext.units)</dependency>
     <dependency reexport="false">97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</dependency>
@@ -128,7 +126,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -210,7 +208,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
   </dependencyVersions>
   <runtime>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/generator/template/main@generator.mps
index 1e31a66f652..8d147ef80fe 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/generator/template/main@generator.mps
@@ -14,7 +14,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/behavior.mps
index 1df7a8ec2cd..fe5fe599ae6 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/behavior.mps
@@ -93,7 +93,7 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -108,12 +108,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -162,7 +163,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -191,7 +192,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -466,7 +466,7 @@
                         <node concept="3clFbF" id="brG9xosJsd" role="3cqZAp">
                           <node concept="2OqwBi" id="brG9xosJse" role="3clFbG">
                             <node concept="37vLTw" id="brG9xosJsf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="brG9xosJsi" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN289" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="brG9xosJsg" role="2OqNvi">
                               <node concept="chp4Y" id="brG9xosJsh" role="cj9EA">
@@ -476,9 +476,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="brG9xosJsi" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN289" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="brG9xosJsj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN28a" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -556,7 +556,7 @@
                           <node concept="3clFbF" id="1lXGHYdV8BM" role="3cqZAp">
                             <node concept="2OqwBi" id="1lXGHYdV8BN" role="3clFbG">
                               <node concept="37vLTw" id="1lXGHYdV8BO" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1lXGHYdV8BR" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN28b" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="1lXGHYdV8BP" role="2OqNvi">
                                 <node concept="chp4Y" id="1lXGHYdV8BQ" role="cj9EA">
@@ -566,9 +566,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1lXGHYdV8BR" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN28b" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1lXGHYdV8BS" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN28c" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/constraints.mps
index 79203df46e1..703044272f9 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/constraints.mps
@@ -93,7 +93,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/structure.mps
index 36b0c79d280..5a212e39b8f 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/structure.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/typesystem.mps
index a5ef9e72246..7f1cfb4d693 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/languageModels/typesystem.mps
@@ -37,7 +37,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -108,7 +108,7 @@
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -125,7 +125,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -141,6 +141,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -260,7 +261,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -299,7 +300,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1047,7 +1047,7 @@
                               <node concept="2OqwBi" id="11_aVLEn74V" role="3clFbG">
                                 <node concept="2OqwBi" id="11_aVLEn7$m" role="2Oq$k0">
                                   <node concept="37vLTw" id="11_aVLEn71A" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="11_aVLEn6Z1" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN28d" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="11_aVLEn7KL" role="2OqNvi">
                                     <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -1061,9 +1061,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="11_aVLEn6Z1" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN28d" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="11_aVLEn6Z2" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN28e" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1223,7 +1223,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="qWsmfOZHpS" role="3uHU7B">
                                             <node concept="37vLTw" id="qWsmfOZH0E" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="qWsmfOZGFz" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN28f" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="qWsmfOZHEf" role="2OqNvi">
                                               <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -1232,9 +1232,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="qWsmfOZGFz" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN28f" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="qWsmfOZGF$" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN28g" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1508,7 +1508,7 @@
                             <node concept="2OqwBi" id="5dSoB2M2h60" role="3clFbG">
                               <node concept="2OqwBi" id="2XknsxclUHZ" role="2Oq$k0">
                                 <node concept="37vLTw" id="2XknsxclUCF" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2XknsxclUzg" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN28h" resolve="it" />
                                 </node>
                                 <node concept="3AV6Ez" id="2XknsxclVcI" role="2OqNvi" />
                               </node>
@@ -1518,9 +1518,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2XknsxclUzg" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN28h" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2XknsxclUzh" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN28i" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
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 dc81975bd89..d6067869f38 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
@@ -40,7 +40,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -102,12 +102,10 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -147,7 +145,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -167,7 +165,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/generator/template/dummy@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/generator/template/dummy@generator.mps
index dab16af1189..63bcb0b14b1 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/generator/template/dummy@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/generator/template/dummy@generator.mps
@@ -18,7 +18,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/actions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/actions.mps
index 20f06f6f0bc..fac979c3bbc 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/actions.mps
@@ -66,6 +66,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -144,7 +145,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -164,7 +165,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -260,7 +260,7 @@
                       <node concept="37vLTI" id="5S6wb2j55oT" role="3clFbG">
                         <node concept="2OqwBi" id="5S6wb2j55oZ" role="37vLTx">
                           <node concept="37vLTw" id="5S6wb2j55oX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5S6wb2j55ov" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN28k" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5S6wb2j55p4" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -280,7 +280,7 @@
                       <node concept="37vLTI" id="5S6wb2j55pi" role="3clFbG">
                         <node concept="2OqwBi" id="5S6wb2j55po" role="37vLTx">
                           <node concept="37vLTw" id="5S6wb2j55pm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5S6wb2j55ov" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN28k" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5S6wb2j55pt" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -314,9 +314,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5S6wb2j55ov" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN28k" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5S6wb2j55ow" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN28l" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -752,7 +752,7 @@
                               </node>
                               <node concept="2OqwBi" id="7e09zBH$8MP" role="3uHU7B">
                                 <node concept="37vLTw" id="7e09zBH$8tD" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7e09zBH$87j" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN28m" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7e09zBH$9ws" role="2OqNvi">
                                   <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -761,9 +761,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7e09zBH$87j" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN28m" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7e09zBH$87k" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN28n" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -778,7 +778,7 @@
                             </node>
                             <node concept="2OqwBi" id="7e09zBH$dgk" role="37vLTJ">
                               <node concept="37vLTw" id="7e09zBH$cUG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7e09zBH$cyn" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN28o" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="7e09zBH$etD" role="2OqNvi">
                                 <ref role="3Tt5mk" to="x27k:1OcdQnyTX2V" resolve="arg" />
@@ -787,9 +787,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7e09zBH$cyn" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN28o" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7e09zBH$cyo" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN28p" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/behavior.mps
index 2bffb8128f4..24352ca4c26 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/behavior.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:ab391014-3e08-4918-9cc5-1c93e3a55c72(com.mbeddr.ext.components.behavior)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
@@ -92,7 +93,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -203,7 +204,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -222,7 +223,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -266,6 +267,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -403,7 +405,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -465,7 +467,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1531,7 +1532,7 @@
                   <node concept="3clFbF" id="2E5EJrUqs0J" role="3cqZAp">
                     <node concept="2OqwBi" id="2E5EJrUqsaz" role="3clFbG">
                       <node concept="37vLTw" id="2E5EJrUqs0I" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2E5EJrUqrTo" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN28q" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="2E5EJrUqsDA" role="2OqNvi">
                         <ref role="3Tt5mk" to="v7ag:2E5EJrUmcRJ" resolve="providedPort" />
@@ -1539,9 +1540,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2E5EJrUqrTo" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28q" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2E5EJrUqrTp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28r" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1600,7 +1601,7 @@
                               </node>
                               <node concept="2OqwBi" id="3LPPE_giFAK" role="1m5AlR">
                                 <node concept="37vLTw" id="3LPPE_giFAL" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3LPPE_giFAW" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN28s" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3LPPE_giFAM" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -1620,7 +1621,7 @@
                         <node concept="2OqwBi" id="3LPPE_giFAQ" role="3uHU7B">
                           <node concept="2OqwBi" id="3LPPE_giFAR" role="2Oq$k0">
                             <node concept="37vLTw" id="3LPPE_giFAS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3LPPE_giFAW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN28s" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3LPPE_giFAT" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -1635,9 +1636,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3LPPE_giFAW" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN28s" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3LPPE_giFAX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN28t" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1702,7 +1703,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="3LPPE_giFBm" role="1m5AlR">
                                             <node concept="37vLTw" id="3LPPE_giFBn" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3LPPE_giFBF" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN28u" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="3LPPE_giFBo" role="2OqNvi">
                                               <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -1732,7 +1733,7 @@
                             </node>
                             <node concept="2OqwBi" id="3LPPE_giFBv" role="1m5AlR">
                               <node concept="37vLTw" id="3LPPE_giFBw" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3LPPE_giFBF" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN28u" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3LPPE_giFBx" role="2OqNvi">
                                 <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -1752,7 +1753,7 @@
                       <node concept="2OqwBi" id="3LPPE_giFB_" role="3uHU7B">
                         <node concept="2OqwBi" id="3LPPE_giFBA" role="2Oq$k0">
                           <node concept="37vLTw" id="3LPPE_giFBB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3LPPE_giFBF" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN28u" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3LPPE_giFBC" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
@@ -1767,9 +1768,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3LPPE_giFBF" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28u" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3LPPE_giFBG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28v" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1809,7 +1810,7 @@
                         <node concept="2OqwBi" id="3LPPE_gmdlq" role="3uHU7B">
                           <node concept="2OqwBi" id="3LPPE_gm5nR" role="2Oq$k0">
                             <node concept="37vLTw" id="3LPPE_gm3Lv" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3LPPE_gj8Q5" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN28w" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3LPPE_gm9x7" role="2OqNvi">
                               <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -1831,7 +1832,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="3LPPE_gkeob" role="1m5AlR">
                                   <node concept="37vLTw" id="3LPPE_gj8PT" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3LPPE_gj8Q5" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN28w" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="3LPPE_gkCZY" role="2OqNvi">
                                     <ref role="3Tt5mk" to="v7ag:7XQHhkHdxo4" resolve="content" />
@@ -1855,9 +1856,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3LPPE_gj8Q5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN28w" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3LPPE_gj8Q6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN28x" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1880,7 +1881,7 @@
                               </node>
                               <node concept="2OqwBi" id="2E5EJrUpHks" role="1m5AlR">
                                 <node concept="37vLTw" id="2E5EJrUpHkt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3LPPE_gmYcY" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN28y" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="2E5EJrUpHku" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:7XQHhkHdxo4" resolve="content" />
@@ -1910,7 +1911,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="2E5EJrUpHkD" role="1m5AlR">
                                       <node concept="37vLTw" id="2E5EJrUpHkE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3LPPE_gmYcY" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN28y" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2E5EJrUpHkF" role="2OqNvi">
                                         <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" resolve="expression" />
@@ -1932,9 +1933,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3LPPE_gmYcY" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28y" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3LPPE_gmYcZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28z" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1957,7 +1958,7 @@
                         <node concept="2OqwBi" id="2E5EJrWC9iv" role="3uHU7w">
                           <node concept="2OqwBi" id="2E5EJrWBS4C" role="2Oq$k0">
                             <node concept="37vLTw" id="2E5EJrWBQNU" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2E5EJrWd8x5" resolve="a" />
+                              <ref role="3cqZAo" node="2SR9xrsN28$" resolve="a" />
                             </node>
                             <node concept="3TrEf2" id="2E5EJrWC0Jw" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:2E5EJrUmcRJ" resolve="providedPort" />
@@ -1970,7 +1971,7 @@
                         <node concept="3cpWs3" id="2E5EJrWBG2_" role="3uHU7B">
                           <node concept="2OqwBi" id="2E5EJrWBr1J" role="3uHU7B">
                             <node concept="37vLTw" id="2E5EJrWBpJF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2E5EJrWd8x5" resolve="a" />
+                              <ref role="3cqZAo" node="2SR9xrsN28$" resolve="a" />
                             </node>
                             <node concept="3TrcHB" id="2E5EJrWByIE" role="2OqNvi">
                               <ref role="3TsBF5" to="v7ag:2E5EJrUmcRQ" resolve="instanceName" />
@@ -1994,7 +1995,7 @@
                               <ref role="3Tt5mk" to="v7ag:2E5EJrUmcRJ" resolve="providedPort" />
                             </node>
                             <node concept="37vLTw" id="2E5EJrWCugK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2E5EJrWd8x7" resolve="b" />
+                              <ref role="3cqZAo" node="2SR9xrsN28A" resolve="b" />
                             </node>
                           </node>
                           <node concept="3TrcHB" id="2E5EJrWCjLF" role="2OqNvi">
@@ -2004,7 +2005,7 @@
                         <node concept="3cpWs3" id="2E5EJrWCjLG" role="3uHU7B">
                           <node concept="2OqwBi" id="2E5EJrWCjLH" role="3uHU7B">
                             <node concept="37vLTw" id="2E5EJrWCpvZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2E5EJrWd8x7" resolve="b" />
+                              <ref role="3cqZAo" node="2SR9xrsN28A" resolve="b" />
                             </node>
                             <node concept="3TrcHB" id="2E5EJrWCjLJ" role="2OqNvi">
                               <ref role="3TsBF5" to="v7ag:2E5EJrUmcRQ" resolve="instanceName" />
@@ -2031,13 +2032,13 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2E5EJrWd8x5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28$" role="1bW2Oz">
                   <property role="TrG5h" value="a" />
-                  <node concept="2jxLKc" id="2E5EJrWd8x6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28_" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="2E5EJrWd8x7" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28A" role="1bW2Oz">
                   <property role="TrG5h" value="b" />
-                  <node concept="2jxLKc" id="2E5EJrWd8x8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28B" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="2E5EJrWd8x9" role="2Dq5b$">
@@ -2265,7 +2266,7 @@
                     <node concept="3fqX7Q" id="5Xnv3$QDZXA" role="3clFbG">
                       <node concept="2OqwBi" id="5Xnv3$QDZXB" role="3fr31v">
                         <node concept="37vLTw" id="5Xnv3$QDZXC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5Xnv3$QDZX3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN28C" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="5Xnv3$QDZXD" role="2OqNvi">
                           <node concept="chp4Y" id="5Xnv3$QDZXE" role="cj9EA">
@@ -2276,9 +2277,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5Xnv3$QDZX3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28C" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5Xnv3$QDZX4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28D" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2349,7 +2350,7 @@
                       <node concept="10Nm6u" id="7JjETeGcPkd" role="3uHU7w" />
                       <node concept="2OqwBi" id="7JjETeGcPk5" role="3uHU7B">
                         <node concept="37vLTw" id="7JjETeGcPk4" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7JjETeGcPk1" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN28E" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7JjETeGcPk9" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:7JjETeGcmqD" resolve="restriction" />
@@ -2358,9 +2359,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7JjETeGcPk1" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28E" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7JjETeGcPk2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28F" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2389,7 +2390,7 @@
                     <node concept="3y3z36" id="7JjETeGcPkx" role="3clFbG">
                       <node concept="2OqwBi" id="7JjETeGcPky" role="3uHU7B">
                         <node concept="37vLTw" id="7JjETeGcPkz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7JjETeGcPkt" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN28G" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7JjETeGcPk$" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:7JjETeGcmqD" resolve="restriction" />
@@ -2399,9 +2400,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7JjETeGcPkt" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28G" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7JjETeGcPku" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28H" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2460,7 +2461,7 @@
                     <node concept="2OqwBi" id="5oFMniD9Orb" role="3clFbG">
                       <node concept="2OqwBi" id="5oFMniD9Or6" role="2Oq$k0">
                         <node concept="37vLTw" id="5oFMniD9Or5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5oFMniD9Or2" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN28I" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5oFMniD9Ora" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -2472,9 +2473,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5oFMniD9Or2" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28I" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5oFMniD9Or3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28J" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2506,7 +2507,7 @@
                     <node concept="2OqwBi" id="5basnX1$vqv" role="3clFbG">
                       <node concept="2OqwBi" id="5basnX1$vqw" role="2Oq$k0">
                         <node concept="37vLTw" id="5basnX1$vqx" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5basnX1$vq$" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN28K" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5basnX1$vqy" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -2518,9 +2519,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5basnX1$vq$" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28K" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5basnX1$vq_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28L" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2871,7 +2872,7 @@
                   <node concept="3clFbF" id="6A4xWqfS5TZ" role="3cqZAp">
                     <node concept="2OqwBi" id="6A4xWqfS5Ul" role="3clFbG">
                       <node concept="37vLTw" id="6A4xWqfS5U0" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6A4xWqfS5TX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN28M" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="6A4xWqfS5Ur" role="2OqNvi">
                         <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -2879,9 +2880,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6A4xWqfS5TX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28M" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6A4xWqfS5TY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28N" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2920,7 +2921,7 @@
                   <node concept="3clFbF" id="F_QT7XsuDM" role="3cqZAp">
                     <node concept="2OqwBi" id="F_QT7XsuDO" role="3clFbG">
                       <node concept="37vLTw" id="F_QT7XsuDQ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="F_QT7XsuDW" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN28O" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="F_QT7XsuDR" role="2OqNvi">
                         <ref role="3TsBF5" to="v7ag:F_QT7XsuBc" resolve="initField" />
@@ -2928,9 +2929,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="F_QT7XsuDW" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28O" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="F_QT7XsuDX" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28P" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3070,7 +3071,7 @@
                     <node concept="2OqwBi" id="6JVEnxIjpHW" role="3clFbG">
                       <node concept="2OqwBi" id="6JVEnxIjpHx" role="2Oq$k0">
                         <node concept="37vLTw" id="6JVEnxIjpHc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6JVEnxIjpH9" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN28Q" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6JVEnxIjpHA" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -3084,9 +3085,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6JVEnxIjpH9" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN28Q" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6JVEnxIjpHa" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN28R" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3534,7 +3535,7 @@
                       <node concept="2OqwBi" id="41KMvfcmnx$" role="3uHU7w">
                         <node concept="2OqwBi" id="41KMvfcmnxv" role="2Oq$k0">
                           <node concept="37vLTw" id="41KMvfcmnxu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="41KMvfcmnx7" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN294" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="41KMvfcmnxz" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -3549,7 +3550,7 @@
                       <node concept="2OqwBi" id="41KMvfcmnxg" role="3uHU7B">
                         <node concept="2OqwBi" id="41KMvfcmnxb" role="2Oq$k0">
                           <node concept="37vLTw" id="41KMvfcmnxa" role="2Oq$k0">
-                            <ref role="3cqZAo" node="41KMvfcmnx7" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN294" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="41KMvfcmnxf" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -3560,9 +3561,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="41KMvfcmnx7" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN294" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="41KMvfcmnx8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN295" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3619,14 +3620,14 @@
                         <ref role="cht4Q" to="v7ag:4AGl5dzwHVj" resolve="Field" />
                       </node>
                       <node concept="37vLTw" id="4AGl5dzwV1W" role="1m5AlR">
-                        <ref role="3cqZAo" node="4AGl5dzwV1X" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN296" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4AGl5dzwV1X" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN296" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4AGl5dzwV1Y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN297" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3655,7 +3656,7 @@
                   <node concept="3clFbF" id="7BIOMJxr2Zm" role="3cqZAp">
                     <node concept="2OqwBi" id="7BIOMJxr3km" role="3clFbG">
                       <node concept="37vLTw" id="7BIOMJxr2Zl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7BIOMJxr2UF" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN298" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="7BIOMJxr7Lh" role="2OqNvi">
                         <ref role="3TsBF5" to="v7ag:F_QT7XsuBc" resolve="initField" />
@@ -3663,9 +3664,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7BIOMJxr2UF" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN298" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7BIOMJxr2UG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN299" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3746,7 +3747,7 @@
                       <node concept="3clFbF" id="71UKpntoZV3" role="3cqZAp">
                         <node concept="2OqwBi" id="71UKpntoZV7" role="3clFbG">
                           <node concept="37vLTw" id="71UKpntoZV4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="71UKpntoZV1" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN29a" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="71UKpntoZVb" role="2OqNvi">
                             <node concept="25Kdxt" id="4AGl5dzwV1c" role="cj9EA">
@@ -3758,9 +3759,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="71UKpntoZV1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN29a" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="71UKpntoZV2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN29b" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4040,7 +4041,7 @@
                     <node concept="3fqX7Q" id="2fh5q8VL2Os" role="3clFbG">
                       <node concept="2OqwBi" id="2fh5q8VL2Ot" role="3fr31v">
                         <node concept="37vLTw" id="2fh5q8VL2Ou" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2fh5q8VL2NJ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN29c" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="2fh5q8VL2Ov" role="2OqNvi">
                           <ref role="3TsBF5" to="v7ag:3TmmsQkDl9b" resolve="abstract" />
@@ -4049,9 +4050,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2fh5q8VL2NJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29c" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2fh5q8VL2NK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29d" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4202,7 +4203,7 @@
                         <node concept="2OqwBi" id="5u7uvg8qQlq" role="3uHU7w">
                           <node concept="2OqwBi" id="5u7uvg8qQkt" role="2Oq$k0">
                             <node concept="37vLTw" id="5u7uvg8qQk0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5u7uvg8qQi2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN29e" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5u7uvg8qQkX" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -4216,7 +4217,7 @@
                         </node>
                         <node concept="2OqwBi" id="5u7uvg8qQi6" role="3uHU7B">
                           <node concept="37vLTw" id="5u7uvg8qQi5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5u7uvg8qQi2" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN29e" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5u7uvg8qQiA" role="2OqNvi">
                             <node concept="chp4Y" id="5u7uvg8qQj4" role="cj9EA">
@@ -4227,9 +4228,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5u7uvg8qQi2" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN29e" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5u7uvg8qQi3" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN29f" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4245,7 +4246,7 @@
                         </node>
                         <node concept="2OqwBi" id="5u7uvg8qQnZ" role="1m5AlR">
                           <node concept="37vLTw" id="5u7uvg8qQnY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5u7uvg8qQns" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN29g" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5u7uvg8qQoY" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -4258,9 +4259,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5u7uvg8qQns" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29g" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5u7uvg8qQnt" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29h" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4323,7 +4324,7 @@
                       <node concept="3clFbF" id="7jSUHHvjoDH" role="3cqZAp">
                         <node concept="2OqwBi" id="7jSUHHvjoDI" role="3clFbG">
                           <node concept="37vLTw" id="7jSUHHvjoDJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7jSUHHvjoDL" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN29i" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7jSUHHvjoDK" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -4331,9 +4332,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7jSUHHvjoDL" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN29i" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7jSUHHvjoDM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN29j" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4378,7 +4379,7 @@
                       <node concept="2OqwBi" id="7jSUHHvjoEE" role="3clFbG">
                         <node concept="2OqwBi" id="7jSUHHvjoEF" role="2Oq$k0">
                           <node concept="37vLTw" id="7jSUHHvjoEG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7jSUHHvjoEB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN29k" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7jSUHHvjoEH" role="2OqNvi">
                             <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -4392,9 +4393,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7jSUHHvjoEB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN29k" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7jSUHHvjoEC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN29l" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4498,7 +4499,7 @@
                     <node concept="3clFbF" id="6hS8P3pzf1Z" role="3cqZAp">
                       <node concept="2OqwBi" id="6hS8P3pzf20" role="3clFbG">
                         <node concept="37vLTw" id="6hS8P3pzf21" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hS8P3pzf23" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN29m" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6hS8P3pzf2s" role="2OqNvi">
                           <ref role="3TsBF5" to="v7ag:3TmmsQkDl9b" resolve="abstract" />
@@ -4506,9 +4507,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hS8P3pzf23" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN29m" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hS8P3pzf24" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN29n" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4536,7 +4537,7 @@
                     <node concept="3clFbF" id="6hS8P3pzf2O" role="3cqZAp">
                       <node concept="2OqwBi" id="6hS8P3pzf2P" role="3clFbG">
                         <node concept="37vLTw" id="6hS8P3pzf2Q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hS8P3pzf2S" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN29o" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6hS8P3pzf2R" role="2OqNvi">
                           <ref role="3TsBF5" to="v7ag:3TmmsQkDl9b" resolve="abstract" />
@@ -4544,9 +4545,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hS8P3pzf2S" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN29o" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hS8P3pzf2T" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN29p" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4576,7 +4577,7 @@
                         <node concept="10Nm6u" id="6hS8P3pzf3A" role="3uHU7w" />
                         <node concept="2OqwBi" id="6hS8P3pzf37" role="3uHU7B">
                           <node concept="37vLTw" id="6hS8P3pzf38" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hS8P3pzf3a" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN29q" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6hS8P3pzf3d" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3PT6Z48LOzM" resolve="implements" />
@@ -4585,9 +4586,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hS8P3pzf3a" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN29q" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hS8P3pzf3b" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN29r" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4617,12 +4618,12 @@
                                 <node concept="3clFbF" id="6hS8P3pzf6v" role="3cqZAp">
                                   <node concept="3clFbC" id="6hS8P3pzf6w" role="3clFbG">
                                     <node concept="37vLTw" id="6hS8P3pzf6x" role="3uHU7w">
-                                      <ref role="3cqZAo" node="6hS8P3pzf6D" resolve="aR" />
+                                      <ref role="3cqZAo" node="2SR9xrsN29u" resolve="aR" />
                                     </node>
                                     <node concept="2OqwBi" id="6hS8P3pzf6y" role="3uHU7B">
                                       <node concept="2OqwBi" id="6hS8P3pzf6z" role="2Oq$k0">
                                         <node concept="37vLTw" id="6hS8P3pzf6$" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6hS8P3pzf6B" resolve="iR" />
+                                          <ref role="3cqZAo" node="2SR9xrsN29s" resolve="iR" />
                                         </node>
                                         <node concept="3TrEf2" id="6hS8P3pzf6_" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3PT6Z48LOzM" resolve="implements" />
@@ -4635,9 +4636,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6hS8P3pzf6B" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN29s" role="1bW2Oz">
                                 <property role="TrG5h" value="iR" />
-                                <node concept="2jxLKc" id="6hS8P3pzf6C" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN29t" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4645,9 +4646,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hS8P3pzf6D" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN29u" role="1bW2Oz">
                     <property role="TrG5h" value="aR" />
-                    <node concept="2jxLKc" id="6hS8P3pzf6E" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN29v" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4724,7 +4725,7 @@
                               <ref role="cht4Q" to="v7ag:3TmmsQkDc76" resolve="Runnable" />
                             </node>
                             <node concept="37vLTw" id="7sxRrz4q62j" role="1m5AlR">
-                              <ref role="3cqZAo" node="2fh5q8VJRLX" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN29w" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -4873,7 +4874,7 @@
                     </node>
                     <node concept="2OqwBi" id="7sxRrz4TesL" role="3clFbw">
                       <node concept="37vLTw" id="7sxRrz4TesM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2fh5q8VJRLX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN29w" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="7sxRrz4TesN" role="2OqNvi">
                         <node concept="chp4Y" id="7sxRrz4TesO" role="cj9EA">
@@ -4917,9 +4918,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2fh5q8VJRLX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29w" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2fh5q8VJRLY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29x" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5348,7 +5349,7 @@
                     <node concept="2OqwBi" id="2LSSMkCIUOa" role="3clFbG">
                       <node concept="2OqwBi" id="2LSSMkCIUNJ" role="2Oq$k0">
                         <node concept="37vLTw" id="2LSSMkCIUNq" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2LSSMkCIUNn" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN29C" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="2LSSMkCIUNO" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5363,9 +5364,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2LSSMkCIUNn" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29C" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2LSSMkCIUNo" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29D" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5505,7 +5506,7 @@
                   <node concept="3clFbF" id="5XplrM0JCP1" role="3cqZAp">
                     <node concept="2OqwBi" id="5XplrM0JCXZ" role="3clFbG">
                       <node concept="37vLTw" id="5XplrM0JCP0" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5XplrM0JCN4" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN29E" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="5XplrM0JD$c" role="2OqNvi">
                         <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -5513,9 +5514,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5XplrM0JCN4" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29E" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5XplrM0JCN5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29F" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5773,7 +5774,7 @@
                                 <node concept="2OqwBi" id="7katCQkEXKP" role="3uHU7B">
                                   <node concept="2OqwBi" id="7katCQkEXKQ" role="2Oq$k0">
                                     <node concept="37vLTw" id="7katCQkEXKR" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7katCQkEXL9" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN29G" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7katCQkEXKS" role="2OqNvi">
                                       <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTW" resolve="source" />
@@ -5791,7 +5792,7 @@
                                 </node>
                                 <node concept="3y3z36" id="7katCQkEXKX" role="3uHU7w">
                                   <node concept="37vLTw" id="7katCQkEXKY" role="3uHU7B">
-                                    <ref role="3cqZAo" node="7katCQkEXL9" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN29G" resolve="it" />
                                   </node>
                                   <node concept="13iPFW" id="7katCQkF68N" role="3uHU7w" />
                                 </node>
@@ -5811,7 +5812,7 @@
                                   </node>
                                   <node concept="2WmjW8" id="7katCQkEXL7" role="2OqNvi">
                                     <node concept="37vLTw" id="7katCQkEXL8" role="25WWJ7">
-                                      <ref role="3cqZAo" node="7katCQkEXL9" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN29G" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -5819,9 +5820,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7katCQkEXL9" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN29G" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7katCQkEXLa" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN29H" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6788,7 +6789,7 @@
                       </node>
                       <node concept="2OqwBi" id="F_QT7XsONT" role="3uHU7B">
                         <node concept="37vLTw" id="F_QT7XsONS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="F_QT7XsONP" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN29I" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="F_QT7XsONX" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:F_QT7XsuCu" resolve="field" />
@@ -6797,9 +6798,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="F_QT7XsONP" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29I" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="F_QT7XsONQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29J" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6854,7 +6855,7 @@
                         <node concept="2OqwBi" id="3_MZZHrtKns" role="3uHU7B">
                           <node concept="2OqwBi" id="3_MZZHrtKnt" role="2Oq$k0">
                             <node concept="37vLTw" id="3_MZZHrtKnu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3_MZZHrtKn_" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN29K" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3_MZZHrtKnv" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTW" resolve="source" />
@@ -6867,7 +6868,7 @@
                       </node>
                       <node concept="2OqwBi" id="3_MZZHrtKnx" role="3uHU7B">
                         <node concept="37vLTw" id="3_MZZHrtKny" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3_MZZHrtKn_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN29K" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3_MZZHrtKnz" role="2OqNvi">
                           <node concept="chp4Y" id="3_MZZHrtKn$" role="cj9EA">
@@ -6878,9 +6879,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3_MZZHrtKn_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29K" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3_MZZHrtKnA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29L" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6964,7 +6965,7 @@
                       <node concept="2OqwBi" id="2LSSMkCGHg2" role="2Oq$k0">
                         <node concept="2OqwBi" id="2LSSMkCGHfB" role="2Oq$k0">
                           <node concept="37vLTw" id="2LSSMkCGHfi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2LSSMkCGHff" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN29M" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2LSSMkCGHfG" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:F_QT7XsuCu" resolve="field" />
@@ -6983,9 +6984,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2LSSMkCGHff" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29M" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2LSSMkCGHfg" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29N" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7025,7 +7026,7 @@
                   <node concept="3clFbF" id="5ru53esJ8$v" role="3cqZAp">
                     <node concept="2OqwBi" id="5ru53esJ8$w" role="3clFbG">
                       <node concept="37vLTw" id="5ru53esJ8$x" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5ru53esJ8$z" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN29Q" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="5ru53esJ8$y" role="2OqNvi">
                         <ref role="37wK5l" node="29JE8qNvtiF" resolve="requiresInitializer" />
@@ -7033,9 +7034,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ru53esJ8$z" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29Q" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ru53esJ8$$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29R" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7069,7 +7070,7 @@
                   <node concept="3clFbF" id="2IZ2bWs0PCZ" role="3cqZAp">
                     <node concept="2OqwBi" id="2IZ2bWs0QbG" role="3clFbG">
                       <node concept="37vLTw" id="2IZ2bWs0PCY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2IZ2bWs0oPl" resolve="port" />
+                        <ref role="3cqZAo" node="2SR9xrsN29S" resolve="port" />
                       </node>
                       <node concept="2qgKlT" id="2IZ2bWs0QQE" role="2OqNvi">
                         <ref role="37wK5l" node="2IZ2bWs0yDx" resolve="isInPort" />
@@ -7077,9 +7078,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2IZ2bWs0oPl" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29S" role="1bW2Oz">
                   <property role="TrG5h" value="port" />
-                  <node concept="2jxLKc" id="2IZ2bWs0oPm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29T" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7119,7 +7120,7 @@
                     <node concept="3fqX7Q" id="2IZ2bWs0WoT" role="3clFbG">
                       <node concept="2OqwBi" id="2IZ2bWs0WoV" role="3fr31v">
                         <node concept="37vLTw" id="2IZ2bWs0WoW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2IZ2bWs0Tkv" resolve="port" />
+                          <ref role="3cqZAo" node="2SR9xrsN29U" resolve="port" />
                         </node>
                         <node concept="2qgKlT" id="2IZ2bWs0WoX" role="2OqNvi">
                           <ref role="37wK5l" node="2IZ2bWs0yDx" resolve="isInPort" />
@@ -7128,9 +7129,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2IZ2bWs0Tkv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29U" role="1bW2Oz">
                   <property role="TrG5h" value="port" />
-                  <node concept="2jxLKc" id="2IZ2bWs0Tkw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29V" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8697,14 +8698,14 @@
                       <ref role="37wK5l" to="qd6m:7oI7FI6rWpR" resolve="dependenciesForType" />
                       <ref role="1Pybhc" to="qd6m:7oI7FI6rWpL" resolve="ModuleContentDepHelper" />
                       <node concept="37vLTw" id="7oI7FI6rW$O" role="37wK5m">
-                        <ref role="3cqZAo" node="7oI7FI6rW$k" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN29Y" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7oI7FI6rW$k" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN29Y" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7oI7FI6rW$l" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN29Z" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8936,7 +8937,7 @@
                     <node concept="2OqwBi" id="5oFMniD9OrS" role="3clFbG">
                       <node concept="2OqwBi" id="5oFMniD9OrN" role="2Oq$k0">
                         <node concept="37vLTw" id="5oFMniD9OrM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5oFMniD9OrJ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2a0" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="5oFMniD9OrR" role="2OqNvi">
                           <ref role="3TtcxE" to="v7ag:5oFMniD8XQ7" resolve="protocols" />
@@ -8946,9 +8947,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5oFMniD9OrJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2a0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5oFMniD9OrK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2a1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8979,7 +8980,7 @@
                     <node concept="2OqwBi" id="2ZUGF54k3eA" role="3clFbG">
                       <node concept="2OqwBi" id="2ZUGF54k3ea" role="2Oq$k0">
                         <node concept="37vLTw" id="2ZUGF54k3dP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2ZUGF54k3dM" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2a2" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6WGVxckB2xN" role="2OqNvi">
                           <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -8993,9 +8994,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ZUGF54k3dM" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2a2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ZUGF54k3dN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2a3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9024,7 +9025,7 @@
                       <node concept="3clFbF" id="6brBMefUdr9" role="3cqZAp">
                         <node concept="2OqwBi" id="6brBMefUdrv" role="3clFbG">
                           <node concept="37vLTw" id="6brBMefUdra" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6brBMefUdr7" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2a4" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6brBMefUdr_" role="2OqNvi">
                             <ref role="3TtcxE" to="v7ag:5oFMniD8XQ7" resolve="protocols" />
@@ -9032,9 +9033,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6brBMefUdr7" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2a4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6brBMefUdr8" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2a5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -9070,7 +9071,7 @@
                         <node concept="3clFbF" id="6brBMefUdoy" role="3cqZAp">
                           <node concept="2OqwBi" id="6brBMefUdoS" role="3clFbG">
                             <node concept="37vLTw" id="6brBMefUdoz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6brBMefUdow" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2a6" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6brBMefUdoY" role="2OqNvi">
                               <ref role="3TtcxE" to="v7ag:5HTuIUP_k1Q" resolve="conditions" />
@@ -9078,9 +9079,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6brBMefUdow" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2a6" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6brBMefUdox" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2a7" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -10369,7 +10370,7 @@
                         <node concept="3clFbF" id="5RuoYRFb96P" role="3cqZAp">
                           <node concept="2OqwBi" id="5RuoYRFb97b" role="3clFbG">
                             <node concept="37vLTw" id="5RuoYRFb96Q" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5RuoYRFb96N" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ai" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5RuoYRFb97h" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -10377,9 +10378,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5RuoYRFb96N" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ai" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5RuoYRFb96O" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2aj" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -10671,7 +10672,7 @@
                         <node concept="3clFbF" id="4WcLiIfjZCB" role="3cqZAp">
                           <node concept="2OqwBi" id="4WcLiIfjZCC" role="3clFbG">
                             <node concept="37vLTw" id="4WcLiIfjZCD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4WcLiIfjZCF" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ak" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4WcLiIfjZCE" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:1VQvajLb13M" resolve="renderReadable" />
@@ -10679,9 +10680,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4WcLiIfjZCF" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ak" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4WcLiIfjZCG" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2al" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11410,7 +11411,7 @@
                                 <node concept="2OqwBi" id="1lsyexBO16O" role="3clFbG">
                                   <node concept="2OqwBi" id="1lsyexBO16m" role="2Oq$k0">
                                     <node concept="37vLTw" id="1lsyexBO161" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1lsyexBO15Y" resolve="ps" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2am" resolve="ps" />
                                     </node>
                                     <node concept="3TrcHB" id="1lsyexBO16u" role="2OqNvi">
                                       <ref role="3TsBF5" to="v7ag:1lsyexBO0OB" resolve="tag" />
@@ -11420,7 +11421,7 @@
                                     <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                     <node concept="2OqwBi" id="1lsyexBO17g" role="37wK5m">
                                       <node concept="37vLTw" id="1lsyexBO16V" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1lsyexBO15t" resolve="rs" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2ao" resolve="rs" />
                                       </node>
                                       <node concept="3TrcHB" id="1lsyexBO17m" role="2OqNvi">
                                         <ref role="3TsBF5" to="v7ag:1lsyexBO0OB" resolve="tag" />
@@ -11430,18 +11431,18 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1lsyexBO15Y" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2am" role="1bW2Oz">
                               <property role="TrG5h" value="ps" />
-                              <node concept="2jxLKc" id="1lsyexBO15Z" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2an" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1lsyexBO15t" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2ao" role="1bW2Oz">
                     <property role="TrG5h" value="rs" />
-                    <node concept="2jxLKc" id="1lsyexBO15u" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2ap" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -13207,7 +13208,7 @@
                           <node concept="3clFbF" id="6WCyKlekt$2" role="3cqZAp">
                             <node concept="2OqwBi" id="6WCyKlekt$3" role="3clFbG">
                               <node concept="37vLTw" id="6WCyKlekt$4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6WCyKlekt$8" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2aq" resolve="it" />
                               </node>
                               <node concept="2Xjw5R" id="6WCyKlekt$5" role="2OqNvi">
                                 <node concept="1xMEDy" id="6WCyKlekt$6" role="1xVPHs">
@@ -13219,9 +13220,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6WCyKlekt$8" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2aq" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6WCyKlekt$9" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2ar" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -13331,7 +13332,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6WCyKlektAO" role="3uHU7B">
                                   <node concept="37vLTw" id="6WCyKlektAv" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6WCyKlektAs" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2as" resolve="it" />
                                   </node>
                                   <node concept="2Xjw5R" id="6WCyKlektAU" role="2OqNvi">
                                     <node concept="1xMEDy" id="6WCyKlektAV" role="1xVPHs">
@@ -13344,9 +13345,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6WCyKlektAs" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2as" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6WCyKlektAt" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2at" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -13365,7 +13366,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5YZjOkvxvLa" role="3uHU7B">
                                     <node concept="37vLTw" id="5YZjOkvxvLi" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6WCyKlekt_i" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2au" resolve="it" />
                                     </node>
                                     <node concept="2Xjw5R" id="5YZjOkvxvLc" role="2OqNvi">
                                       <node concept="1xMEDy" id="5YZjOkvxvLd" role="1xVPHs">
@@ -13391,7 +13392,7 @@
                                     <ref role="3cqZAo" node="2O6m5wQ4qNI" resolve="g" />
                                   </node>
                                   <node concept="37vLTw" id="6WCyKlektDj" role="37wK5m">
-                                    <ref role="3cqZAo" node="6WCyKlekt_i" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2au" resolve="it" />
                                   </node>
                                   <node concept="37vLTw" id="20ezT9ZE7e4" role="37wK5m">
                                     <ref role="3cqZAo" node="5YZjOkvxvL3" resolve="mustBeProxied" />
@@ -13406,9 +13407,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6WCyKlekt_i" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2au" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6WCyKlekt_j" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2av" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -13430,7 +13431,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6WCyKlektBP" role="3uHU7B">
                                   <node concept="37vLTw" id="6WCyKlektBQ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6WCyKlektBU" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2aw" resolve="it" />
                                   </node>
                                   <node concept="2Xjw5R" id="6WCyKlektBR" role="2OqNvi">
                                     <node concept="1xMEDy" id="6WCyKlektBS" role="1xVPHs">
@@ -13443,9 +13444,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6WCyKlektBU" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2aw" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6WCyKlektBV" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2ax" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -13460,14 +13461,14 @@
                                 <ref role="3cqZAo" node="2O6m5wQ4qNI" resolve="g" />
                               </node>
                               <node concept="37vLTw" id="6WCyKlektF3" role="37wK5m">
-                                <ref role="3cqZAo" node="6WCyKlekt_S" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2ay" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6WCyKlekt_S" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2ay" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6WCyKlekt_T" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2az" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -13521,7 +13522,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5YZjOkvxLMT" role="3uHU7B">
                                   <node concept="37vLTw" id="5YZjOkvxLMU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6RCWEZG4upf" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2a$" resolve="it" />
                                   </node>
                                   <node concept="2Xjw5R" id="5YZjOkvxLMV" role="2OqNvi">
                                     <node concept="1xMEDy" id="5YZjOkvxLMW" role="1xVPHs">
@@ -13545,7 +13546,7 @@
                               <ref role="3cqZAo" node="2O6m5wQ4qNI" resolve="g" />
                             </node>
                             <node concept="37vLTw" id="6WCyKlektFj" role="37wK5m">
-                              <ref role="3cqZAo" node="6RCWEZG4upf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2a$" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="5YZjOkvxvLI" role="37wK5m">
                               <ref role="3cqZAo" node="5YZjOkvxLMO" resolve="mustBeProxied" />
@@ -13553,9 +13554,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6RCWEZG4upf" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2a$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6RCWEZG4upg" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2a_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -13576,14 +13577,14 @@
                               <ref role="3cqZAo" node="2O6m5wQ4qNI" resolve="g" />
                             </node>
                             <node concept="37vLTw" id="6WCyKlektFy" role="37wK5m">
-                              <ref role="3cqZAo" node="6RCWEZG4uqS" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2aA" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6RCWEZG4uqS" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2aA" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6RCWEZG4uqT" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2aB" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -13773,6 +13774,9 @@
                             <node concept="3cpWs3" id="4LqD73vDMI6" role="3uHU7B">
                               <node concept="3cpWs3" id="6RCWEZG54iA" role="3uHU7B">
                                 <node concept="3cpWs3" id="1_fY7KTtvkE" role="3uHU7B">
+                                  <node concept="37vLTw" id="1_fY7KTtvnx" role="3uHU7w">
+                                    <ref role="3cqZAo" node="5YZjOkvwAbk" resolve="direction" />
+                                  </node>
                                   <node concept="2OqwBi" id="6RCWEZG54ic" role="3uHU7B">
                                     <node concept="2GrUjf" id="2PhNCEGdCBU" role="2Oq$k0">
                                       <ref role="2Gs0qQ" node="2PhNCEGdCBj" resolve="c" />
@@ -13781,9 +13785,6 @@
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                     </node>
                                   </node>
-                                  <node concept="37vLTw" id="1_fY7KTtvnx" role="3uHU7w">
-                                    <ref role="3cqZAo" node="5YZjOkvwAbk" resolve="direction" />
-                                  </node>
                                 </node>
                                 <node concept="2OqwBi" id="6RCWEZG4uvN" role="3uHU7w">
                                   <node concept="2OqwBi" id="6RCWEZG4uvn" role="2Oq$k0">
@@ -14095,7 +14096,7 @@
                       <node concept="3clFbF" id="6WCyKlekfF8" role="3cqZAp">
                         <node concept="2OqwBi" id="6WCyKlekfF9" role="3clFbG">
                           <node concept="37vLTw" id="6WCyKlekfFa" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6WCyKlekfFc" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2aC" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6WCyKlekfFb" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -14103,9 +14104,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6WCyKlekfFc" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2aC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6WCyKlekfFd" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2aD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -14151,7 +14152,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6WCyKlekqNa" role="3uHU7B">
                                   <node concept="37vLTw" id="6WCyKlekqNb" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6WCyKlekqNd" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2aE" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6WCyKlekqNc" role="2OqNvi">
                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -14160,9 +14161,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6WCyKlekqNd" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2aE" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6WCyKlekqNe" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2aF" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -14731,9 +14732,9 @@
                         <node concept="3cpWs3" id="6WCyKlejRSO" role="37wK5m">
                           <node concept="3cpWs3" id="6WCyKlejRSs" role="3uHU7B">
                             <node concept="3cpWs3" id="4LqD73vEf_8" role="3uHU7B">
-                              <node concept="3cpWs3" id="1dnKoCHzqFA" role="3uHU7B">
+                              <node concept="3cpWs3" id="10T372D8_4i" role="3uHU7B">
                                 <node concept="3cpWs3" id="6RCWEZG5ktD" role="3uHU7B">
-                                  <node concept="3cpWs3" id="1dnKoCHzqFE" role="3uHU7B">
+                                  <node concept="3cpWs3" id="10T372D8_4m" role="3uHU7B">
                                     <node concept="3cpWs3" id="6RCWEZG5krz" role="3uHU7B">
                                       <node concept="2OqwBi" id="6RCWEZG5kr8" role="3uHU7B">
                                         <node concept="2OqwBi" id="6RCWEZG5kqG" role="2Oq$k0">
@@ -14900,7 +14901,7 @@
                   <node concept="3clFbF" id="4paRqaMe4s8" role="3cqZAp">
                     <node concept="2OqwBi" id="4paRqaMe4su" role="3clFbG">
                       <node concept="37vLTw" id="4paRqaMe4s9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4paRqaMe4s6" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2aG" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="4paRqaMe4s$" role="2OqNvi">
                         <ref role="3Tt5mk" to="v7ag:71UKpntoTuF" resolve="port" />
@@ -14908,9 +14909,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4paRqaMe4s6" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2aG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4paRqaMe4s7" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2aH" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/constraints.mps
index 68664a54d86..e085f5b1bc6 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/constraints.mps
@@ -115,7 +115,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -173,6 +173,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -268,7 +269,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -299,7 +300,6 @@
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -348,14 +348,14 @@
                               <ref role="cht4Q" to="v7ag:3TmmsQkDdTN" resolve="AtomicComponent" />
                             </node>
                             <node concept="37vLTw" id="5CkU_dHipQH" role="1m5AlR">
-                              <ref role="3cqZAo" node="5CkU_dHipQI" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2aI" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHipQI" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2aI" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHipQJ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2aJ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -413,7 +413,7 @@
                           <node concept="2OqwBi" id="5CkU_dHioDr" role="3uHU7w">
                             <node concept="2OqwBi" id="5CkU_dHioDs" role="2Oq$k0">
                               <node concept="37vLTw" id="5CkU_dHioDt" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHioD_" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2aK" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5CkU_dHioDu" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -427,7 +427,7 @@
                           </node>
                           <node concept="2OqwBi" id="5CkU_dHioDx" role="3uHU7B">
                             <node concept="37vLTw" id="5CkU_dHioDy" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHioD_" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2aK" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5CkU_dHioDz" role="2OqNvi">
                               <node concept="chp4Y" id="5CkU_dHioD$" role="cj9EA">
@@ -438,9 +438,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHioD_" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2aK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHioDA" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2aL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -554,7 +554,7 @@
                                 <ref role="cht4Q" to="v7ag:3TmmsQkDdU0" resolve="InstanceConfiguration" />
                               </node>
                               <node concept="37vLTw" id="5CkU_dHiojZ" role="1m5AlR">
-                                <ref role="3cqZAo" node="5CkU_dHiok1" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2aM" resolve="it" />
                               </node>
                             </node>
                             <node concept="2qgKlT" id="5CkU_dHiok0" role="2OqNvi">
@@ -563,9 +563,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHiok1" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2aM" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHiok2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2aN" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -839,7 +839,7 @@
                                       <node concept="3fqX7Q" id="5CkU_dHiq3n" role="3clFbG">
                                         <node concept="2OqwBi" id="5CkU_dHiq3o" role="3fr31v">
                                           <node concept="37vLTw" id="5CkU_dHiq3p" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5CkU_dHiq3r" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2aO" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="5CkU_dHiq3q" role="2OqNvi">
                                             <ref role="3TsBF5" to="v7ag:2cSPe2KM0zi" resolve="hidden" />
@@ -848,9 +848,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5CkU_dHiq3r" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2aO" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5CkU_dHiq3s" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2aP" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -898,7 +898,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="5CkU_dHiq3O" role="3uHU7B">
                                               <node concept="37vLTw" id="5CkU_dHiq3P" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5CkU_dHiq3R" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2aQ" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="5CkU_dHiq3Q" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -907,9 +907,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="5CkU_dHiq3R" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2aQ" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="5CkU_dHiq3S" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2aR" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1492,14 +1492,14 @@
                             <ref role="cht4Q" to="v7ag:3TmmsQkCzn9" resolve="Component" />
                           </node>
                           <node concept="37vLTw" id="5CkU_dHinZ_" role="1m5AlR">
-                            <ref role="3cqZAo" node="5CkU_dHinZA" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2aS" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHinZA" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2aS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHinZB" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2aT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1564,14 +1564,14 @@
                             <ref role="cht4Q" to="v7ag:3TmmsQkCzn9" resolve="Component" />
                           </node>
                           <node concept="37vLTw" id="5CkU_dHiobZ" role="1m5AlR">
-                            <ref role="3cqZAo" node="5CkU_dHioc0" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2aU" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHioc0" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2aU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHioc1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2aV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2079,7 +2079,7 @@
                       <node concept="3clFbF" id="5CkU_dHiphp" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHiphq" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHiphr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHipht" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2aW" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5CkU_dHiphs" role="2OqNvi">
                             <ref role="3TsBF5" to="v7ag:5HTuIUPDsz1" resolve="isQuery" />
@@ -2087,9 +2087,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHipht" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2aW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHiphu" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2aX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2154,7 +2154,7 @@
                       <node concept="3clFbF" id="5CkU_dHip77" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHip78" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHip79" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHip7b" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2aY" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5CkU_dHip7a" role="2OqNvi">
                             <ref role="3TsBF5" to="v7ag:5HTuIUPDsz1" resolve="isQuery" />
@@ -2162,9 +2162,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHip7b" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2aY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHip7c" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2aZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2422,14 +2422,14 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="5CkU_dHipuF" role="3uHU7B">
-                            <ref role="3cqZAo" node="5CkU_dHipuG" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2b0" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHipuG" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2b0" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHipuH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2b1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2784,7 +2784,7 @@
                       <node concept="3clFbF" id="5CkU_dHioT4" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHioT5" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHioT6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHioT8" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2b2" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5CkU_dHioT7" role="2OqNvi">
                             <ref role="3TsBF5" to="v7ag:3TmmsQkDl9b" resolve="abstract" />
@@ -2792,9 +2792,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHioT8" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2b2" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHioT9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2b3" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3533,7 +3533,7 @@
                         <node concept="2OqwBi" id="5CkU_dHipeb" role="3clFbG">
                           <node concept="2OqwBi" id="5CkU_dHipec" role="2Oq$k0">
                             <node concept="37vLTw" id="5CkU_dHiped" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5CkU_dHipeh" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2b4" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="5CkU_dHipee" role="2OqNvi">
                               <node concept="3CFYIy" id="5CkU_dHipef" role="3CFYIz">
@@ -3545,9 +3545,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHipeh" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2b4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHipei" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2b5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4586,7 +4586,7 @@
                               </node>
                               <node concept="2OqwBi" id="7_KH4FPxUuq" role="1m5AlR">
                                 <node concept="37vLTw" id="7_KH4FPxTy2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7_KH4FPgrFr" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2b6" resolve="it" />
                                 </node>
                                 <node concept="3JvlWi" id="7_KH4FPy1NQ" role="2OqNvi" />
                               </node>
@@ -4598,7 +4598,7 @@
                           <node concept="2OqwBi" id="7_KH4FPg$dk" role="3uHU7B">
                             <node concept="2OqwBi" id="7_KH4FPgszz" role="2Oq$k0">
                               <node concept="37vLTw" id="7_KH4FPgrUW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7_KH4FPgrFr" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2b6" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="7_KH4FPgtMP" role="2OqNvi">
                                 <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -4613,9 +4613,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7_KH4FPgrFr" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2b6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7_KH4FPgrFs" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2b7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/dataFlow.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/dataFlow.mps
index 559c1097676..bd72471cb25 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/dataFlow.mps
@@ -106,7 +106,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -129,6 +129,7 @@
       <concept id="1649655856141352248" name="jetbrains.mps.lang.pattern.structure.InsertAfterPosition" flags="ng" index="3s5BLU" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -205,7 +206,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -225,7 +226,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
     </language>
@@ -248,13 +248,13 @@
                 <node concept="3clFbS" id="2vEAySXhryk" role="1bW5cS">
                   <node concept="3AgYrR" id="2vEAySXhryn" role="3cqZAp">
                     <node concept="37vLTw" id="2vEAySXhryp" role="3Ah4Yx">
-                      <ref role="3cqZAo" node="2vEAySXhryl" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN2b8" resolve="it" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2vEAySXhryl" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2b8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2vEAySXhrym" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2b9" role="1tU5fm" />
                 </node>
               </node>
             </node>
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 56ec2e1f4ce..932f55f6d28 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
@@ -486,6 +486,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -830,7 +831,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -1143,7 +1143,7 @@
                         <node concept="2OqwBi" id="3xi4v11X_oD" role="3clFbG">
                           <node concept="2OqwBi" id="3xi4v11X_o$" role="2Oq$k0">
                             <node concept="37vLTw" id="3xi4v11X_oz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3xi4v11X_ow" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ba" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="5Xnv3$QA3Au" role="2OqNvi">
                               <ref role="3TtcxE" to="v7ag:5oFMniD8XQ7" resolve="protocols" />
@@ -1153,9 +1153,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3xi4v11X_ow" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ba" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3xi4v11X_ox" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2bb" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1218,7 +1218,7 @@
                         <node concept="2OqwBi" id="2dn8_TmKtPX" role="3clFbG">
                           <node concept="2OqwBi" id="2dn8_TmKtPY" role="2Oq$k0">
                             <node concept="37vLTw" id="2dn8_TmKtPZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2dn8_TmKtQ2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2bc" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="5Xnv3$QA3JX" role="2OqNvi">
                               <ref role="3TtcxE" to="v7ag:5HTuIUP_k1Q" resolve="conditions" />
@@ -1228,9 +1228,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2dn8_TmKtQ2" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2bc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2dn8_TmKtQ3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2bd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4609,7 +4609,7 @@
                               </node>
                               <node concept="2OqwBi" id="2$xXL4HCU73" role="1m5AlR">
                                 <node concept="37vLTw" id="2$xXL4HCTG9" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2be" resolve="it" />
                                 </node>
                                 <node concept="1mfA1w" id="2$xXL4HCZxY" role="2OqNvi" />
                               </node>
@@ -4622,7 +4622,7 @@
                         <node concept="2OqwBi" id="2Fugwv5XUdd" role="3uHU7B">
                           <node concept="2OqwBi" id="2$xXL4HtRNL" role="2Oq$k0">
                             <node concept="37vLTw" id="2$xXL4HtRNM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2be" resolve="it" />
                             </node>
                             <node concept="2NL2c5" id="2Fugwv5XQlu" role="2OqNvi" />
                           </node>
@@ -4634,7 +4634,7 @@
                       <node concept="2OqwBi" id="2$xXL4HtRNO" role="3uHU7B">
                         <node concept="2OqwBi" id="2$xXL4HtRNP" role="2Oq$k0">
                           <node concept="37vLTw" id="2$xXL4HtRNQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2be" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="2$xXL4HtRNR" role="2OqNvi" />
                         </node>
@@ -4647,9 +4647,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2$xXL4HtRNU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2be" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2$xXL4HtRNV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2bf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5095,7 +5095,7 @@
                     <node concept="3clFbF" id="3zuoy_UAthK" role="3cqZAp">
                       <node concept="2OqwBi" id="3zuoy_UAthL" role="3clFbG">
                         <node concept="37vLTw" id="3zuoy_UAthM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3zuoy_UAthQ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2bg" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3zuoy_UAthN" role="2OqNvi">
                           <ref role="37wK5l" to="eup9:5meTu9orL8n" resolve="hasAsTarget" />
@@ -5105,9 +5105,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3zuoy_UAthQ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2bg" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3zuoy_UAthR" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2bh" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5187,7 +5187,7 @@
                     <node concept="3clFbF" id="3zuoy_UAtDn" role="3cqZAp">
                       <node concept="2OqwBi" id="3zuoy_UAtDo" role="3clFbG">
                         <node concept="37vLTw" id="3zuoy_UAtDp" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3zuoy_UAtDt" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2bi" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3zuoy_UAtDq" role="2OqNvi">
                           <ref role="37wK5l" to="eup9:2ZUGF54kZL1" resolve="hasAsSource" />
@@ -5197,9 +5197,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3zuoy_UAtDt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2bi" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3zuoy_UAtDu" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2bj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5833,7 +5833,7 @@
                           <node concept="2OqwBi" id="7sHDEc2WV2i" role="3clFbG">
                             <node concept="2OqwBi" id="7sHDEc2WV2j" role="2Oq$k0">
                               <node concept="37vLTw" id="7sHDEc2WV2k" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7sHDEc2WV2o" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2bk" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7sHDEc2WV2l" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5846,9 +5846,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7sHDEc2WV2o" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2bk" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7sHDEc2WV2p" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2bl" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6082,7 +6082,7 @@
                           <node concept="2OqwBi" id="7sHDEc2X1EX" role="3clFbG">
                             <node concept="2OqwBi" id="7sHDEc2X1EY" role="2Oq$k0">
                               <node concept="37vLTw" id="7sHDEc2X1EZ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7sHDEc2X1F3" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2bm" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7sHDEc2X1F0" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6097,9 +6097,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7sHDEc2X1F3" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2bm" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7sHDEc2X1F4" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2bn" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6246,7 +6246,7 @@
                           <node concept="2OqwBi" id="7sHDEc2X2rX" role="3clFbG">
                             <node concept="2OqwBi" id="7sHDEc2X2rY" role="2Oq$k0">
                               <node concept="37vLTw" id="7sHDEc2X2rZ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7sHDEc2X2s3" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2bo" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7sHDEc2X2s0" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6261,9 +6261,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7sHDEc2X2s3" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2bo" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7sHDEc2X2s4" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2bp" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6656,7 +6656,7 @@
                           <node concept="3clFbF" id="1gSgWEgqStY" role="3cqZAp">
                             <node concept="2OqwBi" id="1gSgWEgqSR4" role="3clFbG">
                               <node concept="37vLTw" id="1gSgWEgqStX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1gSgWEgqRPf" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2bq" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1gSgWEgqUBi" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v7ag:5JgQ5vqY0yt" resolve="portRef" />
@@ -6664,9 +6664,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1gSgWEgqRPf" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2bq" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1gSgWEgqRPg" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2br" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6817,7 +6817,7 @@
                               <node concept="2OqwBi" id="4Zf0iOaNoOA" role="3clFbG">
                                 <node concept="2OqwBi" id="4Zf0iOaNoOB" role="2Oq$k0">
                                   <node concept="37vLTw" id="4Zf0iOaNoOC" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4Zf0iOaNoOG" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2bs" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="4Zf0iOaNoOD" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6830,9 +6830,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Zf0iOaNoOG" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2bs" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4Zf0iOaNoOH" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2bt" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -6857,7 +6857,7 @@
                               <node concept="2OqwBi" id="4Zf0iOaNoOT" role="3clFbG">
                                 <node concept="2OqwBi" id="4Zf0iOaNoOU" role="2Oq$k0">
                                   <node concept="37vLTw" id="4Zf0iOaNoOV" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4Zf0iOaNoOZ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2bu" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="4Zf0iOaNoOW" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6870,9 +6870,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Zf0iOaNoOZ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2bu" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4Zf0iOaNoP0" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2bv" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -6904,7 +6904,7 @@
                               <node concept="1Wc70l" id="4Zf0iOaNyiS" role="3clFbG">
                                 <node concept="2OqwBi" id="4Zf0iOaNyiT" role="3uHU7w">
                                   <node concept="37vLTw" id="4Zf0iOaNyiU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4Zf0iOaNyj2" resolve="connectorConcept" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2bw" resolve="connectorConcept" />
                                   </node>
                                   <node concept="2qgKlT" id="4Zf0iOaNyiV" role="2OqNvi">
                                     <ref role="37wK5l" to="eup9:2V8b0wQJ4ZA" resolve="isConnectable" />
@@ -6919,7 +6919,7 @@
                                 <node concept="3fqX7Q" id="4Zf0iOaNyiY" role="3uHU7B">
                                   <node concept="2OqwBi" id="4Zf0iOaNyiZ" role="3fr31v">
                                     <node concept="37vLTw" id="4Zf0iOaNyj0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4Zf0iOaNyj2" resolve="connectorConcept" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2bw" resolve="connectorConcept" />
                                     </node>
                                     <node concept="liA8E" id="4Zf0iOaNyj1" role="2OqNvi">
                                       <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -6929,9 +6929,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Zf0iOaNyj2" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2bw" role="1bW2Oz">
                             <property role="TrG5h" value="connectorConcept" />
-                            <node concept="2jxLKc" id="4Zf0iOaNyj3" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2bx" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7005,7 +7005,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.contentEquals(java.lang.CharSequence)" resolve="contentEquals" />
                                   <node concept="2OqwBi" id="1YhneQ3X2FC" role="37wK5m">
                                     <node concept="37vLTw" id="1YhneQ3X2rq" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4Zf0iOaM_6i" resolve="port" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2by" resolve="port" />
                                     </node>
                                     <node concept="3TrcHB" id="1YhneQ3X3az" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7015,9 +7015,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Zf0iOaM_6i" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2by" role="1bW2Oz">
                             <property role="TrG5h" value="port" />
-                            <node concept="2jxLKc" id="4Zf0iOaM_6j" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2bz" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7051,7 +7051,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.contentEquals(java.lang.CharSequence)" resolve="contentEquals" />
                                   <node concept="2OqwBi" id="1YhneQ3X62p" role="37wK5m">
                                     <node concept="37vLTw" id="1YhneQ3X5M3" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4Zf0iOaMAqq" resolve="port" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2b$" resolve="port" />
                                     </node>
                                     <node concept="3TrcHB" id="1YhneQ3X6Qh" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7061,9 +7061,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Zf0iOaMAqq" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2b$" role="1bW2Oz">
                             <property role="TrG5h" value="port" />
-                            <node concept="2jxLKc" id="4Zf0iOaMAqr" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2b_" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7091,7 +7091,7 @@
                               <node concept="2OqwBi" id="4Zf0iOaNfLa" role="3clFbG">
                                 <node concept="2OqwBi" id="4Zf0iOaNfLb" role="2Oq$k0">
                                   <node concept="37vLTw" id="4Zf0iOaNfLc" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4Zf0iOaNfLg" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2bA" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="4Zf0iOaNfLd" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7104,9 +7104,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Zf0iOaNfLg" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2bA" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4Zf0iOaNfLh" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2bB" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7131,7 +7131,7 @@
                               <node concept="2OqwBi" id="4Zf0iOaNhm2" role="3clFbG">
                                 <node concept="2OqwBi" id="4Zf0iOaNhm3" role="2Oq$k0">
                                   <node concept="37vLTw" id="4Zf0iOaNhm4" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4Zf0iOaNhm8" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2bC" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="4Zf0iOaNhm5" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7144,9 +7144,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4Zf0iOaNhm8" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2bC" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4Zf0iOaNhm9" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2bD" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7198,7 +7198,7 @@
                             <node concept="1Wc70l" id="4Zf0iOaNamp" role="3clFbG">
                               <node concept="2OqwBi" id="4Zf0iOaNc07" role="3uHU7w">
                                 <node concept="37vLTw" id="4Zf0iOaNbd4" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4Zf0iOaN0DN" resolve="connectorConcept" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2bE" resolve="connectorConcept" />
                                 </node>
                                 <node concept="2qgKlT" id="4Zf0iOaNcRu" role="2OqNvi">
                                   <ref role="37wK5l" to="eup9:2V8b0wQJ4ZA" resolve="isConnectable" />
@@ -7213,7 +7213,7 @@
                               <node concept="3fqX7Q" id="4Zf0iOaN802" role="3uHU7B">
                                 <node concept="2OqwBi" id="4Zf0iOaN804" role="3fr31v">
                                   <node concept="37vLTw" id="4Zf0iOaN805" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4Zf0iOaN0DN" resolve="connectorConcept" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2bE" resolve="connectorConcept" />
                                   </node>
                                   <node concept="liA8E" id="4Zf0iOaN806" role="2OqNvi">
                                     <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -7223,9 +7223,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4Zf0iOaN0DN" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2bE" role="1bW2Oz">
                           <property role="TrG5h" value="connectorConcept" />
-                          <node concept="2jxLKc" id="4Zf0iOaN0DO" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2bF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -7274,16 +7274,16 @@
                                 <node concept="2Zo12i" id="2IZ2bWrD7dc" role="2OqNvi">
                                   <node concept="25Kdxt" id="2IZ2bWrD7dd" role="2Zo12j">
                                     <node concept="37vLTw" id="2IZ2bWrD7de" role="25KhWn">
-                                      <ref role="3cqZAo" node="2IZ2bWrD7df" resolve="eligibleConcept" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2bG" resolve="eligibleConcept" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2IZ2bWrD7df" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2bG" role="1bW2Oz">
                             <property role="TrG5h" value="eligibleConcept" />
-                            <node concept="2jxLKc" id="2IZ2bWrD7dg" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2bH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/findUsages.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/findUsages.mps
index 23567f5a23f..a167702e7b5 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/findUsages.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/findUsages.mps
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,7 +79,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/intentions.mps
index 898276bedc4..93a6fb81454 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/intentions.mps
@@ -87,7 +87,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -104,6 +104,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -225,7 +226,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -246,7 +247,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
     </language>
@@ -682,7 +682,7 @@
                               </node>
                               <node concept="2OqwBi" id="7$_eEdIcG$T" role="3uHU7B">
                                 <node concept="37vLTw" id="7$_eEdIcG$L" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7$_eEdIcG$u" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2bI" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7$_eEdIcG$X" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3U_nJP19OhZ" resolve="calledOperation" />
@@ -693,7 +693,7 @@
                               <node concept="2Sf5sV" id="3$v$DpgBhnU" role="3uHU7w" />
                               <node concept="2OqwBi" id="3$v$DpgB9Eq" role="3uHU7B">
                                 <node concept="37vLTw" id="3$v$DpgB9E5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7$_eEdIcG$u" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2bI" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3$v$DpgBhnx" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3U_nJP19H_S" resolve="providedPort" />
@@ -703,9 +703,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7$_eEdIcG$u" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2bI" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7$_eEdIcG$v" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2bJ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -764,11 +764,11 @@
                                   <node concept="1Wc70l" id="7dfuMW5RF$X" role="3clFbG">
                                     <node concept="3clFbC" id="7dfuMW5RF$Y" role="3uHU7w">
                                       <node concept="37vLTw" id="7dfuMW5RF$Z" role="3uHU7w">
-                                        <ref role="3cqZAo" node="7dfuMW5Ruhl" resolve="op" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2bM" resolve="op" />
                                       </node>
                                       <node concept="2OqwBi" id="7dfuMW5RF_0" role="3uHU7B">
                                         <node concept="37vLTw" id="7dfuMW5RF_1" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7dfuMW5RF_8" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2bK" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="7dfuMW5RF_2" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3U_nJP19OhZ" resolve="calledOperation" />
@@ -778,7 +778,7 @@
                                     <node concept="3clFbC" id="7dfuMW5RF_3" role="3uHU7B">
                                       <node concept="2OqwBi" id="7dfuMW5RF_4" role="3uHU7B">
                                         <node concept="37vLTw" id="7dfuMW5RF_5" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7dfuMW5RF_8" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2bK" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="7dfuMW5RF_6" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3U_nJP19H_S" resolve="providedPort" />
@@ -789,9 +789,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7dfuMW5RF_8" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2bK" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7dfuMW5RF_9" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2bL" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -799,9 +799,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7dfuMW5Ruhl" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2bM" role="1bW2Oz">
                     <property role="TrG5h" value="op" />
-                    <node concept="2jxLKc" id="7dfuMW5Ruhm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2bN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2467,7 +2467,7 @@
                   <node concept="3clFbF" id="5HHTCV_aL3k" role="3cqZAp">
                     <node concept="2OqwBi" id="5HHTCV_aLjo" role="3clFbG">
                       <node concept="37vLTw" id="5HHTCV_aL3j" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5HHTCV_aKKN" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2bO" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5HHTCV_aLLU" role="2OqNvi">
                         <node concept="chp4Y" id="5HHTCV_aM5e" role="cj9EA">
@@ -2477,9 +2477,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5HHTCV_aKKN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2bO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5HHTCV_aKKO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2bP" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/migration.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/migration.mps
index 1e70ea012c0..d128a109d7e 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -63,7 +63,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -72,7 +72,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -138,7 +138,7 @@
       <concept id="1215467301810" name="jetbrains.mps.lang.smodel.structure.Property_RemoveOperation" flags="nn" index="3ZvMEC" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/scripts.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/scripts.mps
index 219b4b9d3f9..f870fe326b4 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/scripts.mps
@@ -74,7 +74,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -140,7 +140,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/textGen.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/textGen.mps
index 1dc38e70bbb..fddd804906d 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/textGen.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/textGen.mps
@@ -66,7 +66,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/typesystem.mps
index 8a6249ecd84..af6bf7c469a 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/typesystem.mps
@@ -132,7 +132,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -173,6 +173,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -391,7 +392,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -432,7 +433,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -1802,7 +1802,7 @@
                                   <node concept="3clFbF" id="2ZUGF54kCuD" role="3cqZAp">
                                     <node concept="2OqwBi" id="2ZUGF54kZOK" role="3clFbG">
                                       <node concept="37vLTw" id="2ZUGF54kZOr" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2ZUGF54kCv1" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2bQ" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="2ZUGF54kZOS" role="2OqNvi">
                                         <ref role="37wK5l" to="eup9:2ZUGF54kZL1" resolve="hasAsSource" />
@@ -1836,9 +1836,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2ZUGF54kCv1" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2bQ" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="2ZUGF54kCv2" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2bR" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1927,7 +1927,7 @@
                                   <node concept="3clFbF" id="5meTu9orL5h" role="3cqZAp">
                                     <node concept="2OqwBi" id="5meTu9orL5i" role="3clFbG">
                                       <node concept="37vLTw" id="5meTu9orL5j" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5meTu9orL5v" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2bS" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="5meTu9orL5k" role="2OqNvi">
                                         <ref role="37wK5l" to="eup9:5meTu9orL8n" resolve="hasAsTarget" />
@@ -1961,9 +1961,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5meTu9orL5v" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2bS" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="5meTu9orL5w" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2bT" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2194,7 +2194,7 @@
                                   <node concept="3clFbF" id="7z1efbQQLB3" role="3cqZAp">
                                     <node concept="2OqwBi" id="7z1efbQQLB4" role="3clFbG">
                                       <node concept="37vLTw" id="7z1efbQQLB5" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7z1efbQQLB8" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2bU" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="7z1efbQQLB6" role="2OqNvi">
                                         <node concept="chp4Y" id="7z1efbQQLB7" role="cj9EA">
@@ -2204,9 +2204,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="7z1efbQQLB8" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2bU" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7z1efbQQLB9" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2bV" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2221,7 +2221,7 @@
                                         <ref role="cht4Q" to="v7ag:6JVEnxIiSo9" resolve="ISatisfiesPort" />
                                       </node>
                                       <node concept="37vLTw" id="7z1efbQQLBg" role="1m5AlR">
-                                        <ref role="3cqZAo" node="7z1efbQQLBk" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2bW" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="7z1efbQQLBh" role="2OqNvi">
@@ -2236,9 +2236,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7z1efbQQLBk" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2bW" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7z1efbQQLBl" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2bX" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2450,7 +2450,7 @@
                                   <node concept="3clFbF" id="6JVEnxIiSvD" role="3cqZAp">
                                     <node concept="2OqwBi" id="6JVEnxIiSvZ" role="3clFbG">
                                       <node concept="37vLTw" id="6JVEnxIiSvE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6JVEnxIiSvB" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2bY" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="6JVEnxIiSw5" role="2OqNvi">
                                         <node concept="chp4Y" id="6JVEnxIiSw7" role="cj9EA">
@@ -2460,9 +2460,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6JVEnxIiSvB" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2bY" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6JVEnxIiSvC" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2bZ" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2477,7 +2477,7 @@
                                         <ref role="cht4Q" to="v7ag:6JVEnxIiSo9" resolve="ISatisfiesPort" />
                                       </node>
                                       <node concept="37vLTw" id="LUz4xAqU14" role="1m5AlR">
-                                        <ref role="3cqZAo" node="LUz4xAqU11" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2c0" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="6JVEnxIiSwS" role="2OqNvi">
@@ -2492,9 +2492,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="LUz4xAqU11" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2c0" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="LUz4xAqU12" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2c1" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2606,7 +2606,7 @@
                                 <node concept="2OqwBi" id="3_MZZHrtKns" role="3uHU7B">
                                   <node concept="2OqwBi" id="3_MZZHrtKnt" role="2Oq$k0">
                                     <node concept="37vLTw" id="3_MZZHrtKnu" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3_MZZHrtKn_" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2c2" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="36Bkyc4p0Om" role="2OqNvi">
                                       <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTX" resolve="target" />
@@ -2619,9 +2619,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3_MZZHrtKn_" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2c2" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3_MZZHrtKnA" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2c3" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2667,7 +2667,7 @@
                                     <node concept="2OqwBi" id="33VMAJZdpK_" role="2Oq$k0">
                                       <node concept="1PxgMI" id="33VMAJZdpKA" role="2Oq$k0">
                                         <node concept="37vLTw" id="33VMAJZdpKB" role="1m5AlR">
-                                          <ref role="3cqZAo" node="33VMAJZdpKK" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2c4" resolve="it" />
                                         </node>
                                         <node concept="chp4Y" id="1SbcsM_AspU" role="3oSUPX">
                                           <ref role="cht4Q" to="v7ag:pTHqv6KODH" resolve="PortAdapterOpCallExpr" />
@@ -2692,7 +2692,7 @@
                             </node>
                             <node concept="2OqwBi" id="33VMAJZdpKG" role="3uHU7B">
                               <node concept="37vLTw" id="33VMAJZdpKH" role="2Oq$k0">
-                                <ref role="3cqZAo" node="33VMAJZdpKK" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2c4" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="33VMAJZdpKI" role="2OqNvi">
                                 <node concept="chp4Y" id="33VMAJZdpKJ" role="cj9EA">
@@ -2703,9 +2703,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="33VMAJZdpKK" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2c4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="33VMAJZdpKL" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2c5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3154,7 +3154,7 @@
                               <node concept="10Nm6u" id="7iEEB7pLJlL" role="3uHU7w" />
                               <node concept="2OqwBi" id="7iEEB7pLBvo" role="3uHU7B">
                                 <node concept="37vLTw" id="7iEEB7pLBvn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5MsLoqRZx2v" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2c6" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7iEEB7pLJlH" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3164,7 +3164,7 @@
                             <node concept="2OqwBi" id="5MsLoqRZx2n" role="3uHU7w">
                               <node concept="2OqwBi" id="5MsLoqRZx2o" role="2Oq$k0">
                                 <node concept="37vLTw" id="5MsLoqRZx2p" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5MsLoqRZx2v" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2c6" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5MsLoqRZx2q" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3185,9 +3185,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5MsLoqRZx2v" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2c6" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5MsLoqRZx2w" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2c7" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3439,7 +3439,7 @@
                             <node concept="2OqwBi" id="3xi4v11Xj23" role="3clFbG">
                               <node concept="2OqwBi" id="3xi4v11Xj2a" role="2Oq$k0">
                                 <node concept="37vLTw" id="3xi4v11Xj22" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3xi4v11Xj1Z" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2c8" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3xi4v11Xj2e" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -3453,9 +3453,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3xi4v11Xj1Z" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2c8" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3xi4v11Xj20" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2c9" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3531,7 +3531,7 @@
                   <node concept="2OqwBi" id="3xi4v11Xj2K" role="3clFbG">
                     <node concept="2OqwBi" id="3xi4v11Xj2F" role="2Oq$k0">
                       <node concept="37vLTw" id="3xi4v11Xj2E" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3xi4v11Xj2B" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ca" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="3xi4v11Xj2J" role="2OqNvi">
                         <ref role="3TtcxE" to="v7ag:5oFMniD8XQ7" resolve="protocols" />
@@ -3541,9 +3541,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="3xi4v11Xj2B" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2ca" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="3xi4v11Xj2C" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2cb" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -3692,7 +3692,7 @@
                             <node concept="2OqwBi" id="2dn8_TmKtR8" role="3clFbG">
                               <node concept="2OqwBi" id="2dn8_TmKtR9" role="2Oq$k0">
                                 <node concept="37vLTw" id="2dn8_TmKtRa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2dn8_TmKtRe" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2cc" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="2dn8_TmKtRb" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -3706,9 +3706,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2dn8_TmKtRe" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2cc" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2dn8_TmKtRf" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2cd" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3784,7 +3784,7 @@
                   <node concept="2OqwBi" id="2dn8_TmKtRB" role="3clFbG">
                     <node concept="2OqwBi" id="2dn8_TmKtRC" role="2Oq$k0">
                       <node concept="37vLTw" id="2dn8_TmKtRD" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2dn8_TmKtRG" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ce" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="2dn8_TmKtRI" role="2OqNvi">
                         <ref role="3TtcxE" to="v7ag:5HTuIUP_k1Q" resolve="conditions" />
@@ -3794,9 +3794,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="2dn8_TmKtRG" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2ce" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="2dn8_TmKtRH" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2cf" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -3942,7 +3942,7 @@
                         <node concept="2OqwBi" id="3xi4v11Yl9L" role="3uHU7B">
                           <node concept="2OqwBi" id="3xi4v11Y2jv" role="2Oq$k0">
                             <node concept="37vLTw" id="3xi4v11Y2ju" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3xi4v11Y2jr" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2cg" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3xi4v11Y2jz" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:5oFMniD8XPG" resolve="from" />
@@ -3955,9 +3955,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3xi4v11Y2jr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2cg" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3xi4v11Y2js" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2ch" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4115,7 +4115,7 @@
                           </node>
                           <node concept="2OqwBi" id="F_QT7XsuFG" role="3uHU7B">
                             <node concept="37vLTw" id="F_QT7XsuFF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="F_QT7XsuFC" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ci" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="F_QT7XsuFK" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:F_QT7XsuCu" resolve="field" />
@@ -4124,9 +4124,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="F_QT7XsuFC" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ci" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="F_QT7XsuFD" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2cj" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4832,7 +4832,7 @@
                           </node>
                           <node concept="2OqwBi" id="57eqSrvwmXV" role="3uHU7B">
                             <node concept="37vLTw" id="57eqSrvwmXA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="57eqSrvwmXz" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ck" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="57eqSrvwmY1" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:wOd6nl4Yxi" resolve="config" />
@@ -4841,9 +4841,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="57eqSrvwmXz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ck" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="57eqSrvwmX$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2cl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5225,7 +5225,7 @@
                         <node concept="3fqX7Q" id="3PT6Z48IME7" role="3clFbG">
                           <node concept="2OqwBi" id="3PT6Z48IMEu" role="3fr31v">
                             <node concept="37vLTw" id="3PT6Z48IME9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3PT6Z48IME4" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2cm" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="7bk7NuGZgVD" role="2OqNvi">
                               <ref role="37wK5l" to="ywuz:6SENleF$SRD" resolve="isSideeffectFree" />
@@ -5234,9 +5234,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3PT6Z48IME4" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2cm" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3PT6Z48IME5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2cn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5249,13 +5249,13 @@
                         <property role="Xl_RC" value="this expression is not idempotent and may be evaluated more than once by the inlined runnable " />
                       </node>
                       <node concept="37vLTw" id="3PT6Z48IMDA" role="1urrMF">
-                        <ref role="3cqZAo" node="3PT6Z48IMCZ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2co" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3PT6Z48IMCZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2co" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3PT6Z48IMD0" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2cp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6133,7 +6133,7 @@
                         </node>
                         <node concept="2OqwBi" id="6hS8P3pzeMZ" role="3uHU7B">
                           <node concept="37vLTw" id="6hS8P3pzeME" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hS8P3pzeMB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2cq" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6hS8P3pzeN5" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3PT6Z48LOzB" resolve="runnable" />
@@ -6142,9 +6142,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hS8P3pzeMB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2cq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hS8P3pzeMC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2cr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7604,7 +7604,7 @@
                       <node concept="2OqwBi" id="6JVEnxIjn$q" role="3clFbG">
                         <node concept="2OqwBi" id="6JVEnxIjnzZ" role="2Oq$k0">
                           <node concept="37vLTw" id="6JVEnxIjnzE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6JVEnxIjnzB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2cs" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6JVEnxIjn$4" role="2OqNvi">
                             <ref role="3Tt5mk" to="v7ag:3TmmsQkDcDO" resolve="trigger" />
@@ -7618,9 +7618,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6JVEnxIjnzB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2cs" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6JVEnxIjnzC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2ct" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8623,7 +8623,7 @@
                         <node concept="3clFbF" id="slnbckF1u5" role="3cqZAp">
                           <node concept="2OqwBi" id="slnbckF1u6" role="3clFbG">
                             <node concept="37vLTw" id="slnbckF1u7" role="2Oq$k0">
-                              <ref role="3cqZAo" node="slnbckF1u9" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2cu" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="slnbckF1u8" role="2OqNvi">
                               <ref role="3TsBF5" to="vs0r:DubiFAXCMb" resolve="reexport" />
@@ -8631,9 +8631,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="slnbckF1u9" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2cu" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="slnbckF1ua" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2cv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8935,7 +8935,7 @@
                     <node concept="2OqwBi" id="6Ywynt2TVqX" role="3clFbG">
                       <node concept="2OqwBi" id="6Ywynt2TVqY" role="2Oq$k0">
                         <node concept="37vLTw" id="6Ywynt2TVqZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Ywynt2TVr3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2cw" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="6Ywynt2TVr0" role="2OqNvi">
                           <node concept="3CFYIy" id="6Ywynt2TVr1" role="3CFYIz">
@@ -8947,9 +8947,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Ywynt2TVr3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2cw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Ywynt2TVr4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2cx" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8986,7 +8986,7 @@
                   <node concept="3clFbF" id="6Ywynt2TVxW" role="3cqZAp">
                     <node concept="2OqwBi" id="6Ywynt2TVyi" role="3clFbG">
                       <node concept="37vLTw" id="6Ywynt2TVxX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6Ywynt2TVxU" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2cy" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="6Ywynt2TVyo" role="2OqNvi">
                         <ref role="3Tt5mk" to="v7ag:29JE8qNvJxy" resolve="port" />
@@ -8994,9 +8994,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Ywynt2TVxU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2cy" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Ywynt2TVxV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2cz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9020,7 +9020,7 @@
                       </node>
                       <node concept="3JPx81" id="6Ywynt2TVyT" role="2OqNvi">
                         <node concept="37vLTw" id="6Ywynt2TVyV" role="25WWJ7">
-                          <ref role="3cqZAo" node="6Ywynt2TVxr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2c$" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -9030,7 +9030,7 @@
                       <node concept="3cpWs3" id="6Ywynt2TVz1" role="2MkJ7o">
                         <node concept="2OqwBi" id="6Ywynt2TVzp" role="3uHU7B">
                           <node concept="37vLTw" id="6Ywynt2TVz4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Ywynt2TVxr" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2c$" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6Ywynt2TVzv" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -9047,9 +9047,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6Ywynt2TVxr" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2c$" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="6Ywynt2TVxs" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2c_" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -10214,7 +10214,7 @@
                             <node concept="2OqwBi" id="1Q5RJWOHMPb" role="2Oq$k0">
                               <node concept="1PxgMI" id="1Q5RJWOHMPc" role="2Oq$k0">
                                 <node concept="37vLTw" id="1Q5RJWOHMPd" role="1m5AlR">
-                                  <ref role="3cqZAo" node="1Q5RJWOHMPq" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2cA" resolve="it" />
                                 </node>
                                 <node concept="chp4Y" id="1SbcsM_AspZ" role="3oSUPX">
                                   <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
@@ -10237,7 +10237,7 @@
                                 <node concept="2OqwBi" id="1Q5RJWOHMPl" role="1m5AlR">
                                   <node concept="1PxgMI" id="1Q5RJWOHMPm" role="2Oq$k0">
                                     <node concept="37vLTw" id="1Q5RJWOHMPn" role="1m5AlR">
-                                      <ref role="3cqZAo" node="1Q5RJWOHMPq" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2cA" resolve="it" />
                                     </node>
                                     <node concept="chp4Y" id="1SbcsM_AspT" role="3oSUPX">
                                       <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
@@ -10259,9 +10259,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1Q5RJWOHMPq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2cA" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1Q5RJWOHMPr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2cB" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10314,7 +10314,7 @@
                             <node concept="2OqwBi" id="1Q5RJWOHMPL" role="2Oq$k0">
                               <node concept="1PxgMI" id="1Q5RJWOHMPM" role="2Oq$k0">
                                 <node concept="37vLTw" id="1Q5RJWOHMPN" role="1m5AlR">
-                                  <ref role="3cqZAo" node="1Q5RJWOHMQ0" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2cC" resolve="it" />
                                 </node>
                                 <node concept="chp4Y" id="1SbcsM_Asq3" role="3oSUPX">
                                   <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
@@ -10337,7 +10337,7 @@
                                 <node concept="2OqwBi" id="1Q5RJWOHMPV" role="1m5AlR">
                                   <node concept="1PxgMI" id="1Q5RJWOHMPW" role="2Oq$k0">
                                     <node concept="37vLTw" id="1Q5RJWOHMPX" role="1m5AlR">
-                                      <ref role="3cqZAo" node="1Q5RJWOHMQ0" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2cC" resolve="it" />
                                     </node>
                                     <node concept="chp4Y" id="1SbcsM_Asq1" role="3oSUPX">
                                       <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
@@ -10359,9 +10359,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1Q5RJWOHMQ0" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2cC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1Q5RJWOHMQ1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2cD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10691,7 +10691,7 @@
                                   <node concept="3clFbF" id="slnbckBPWE" role="3cqZAp">
                                     <node concept="2OqwBi" id="slnbckBPWF" role="3clFbG">
                                       <node concept="37vLTw" id="slnbckBPWG" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="slnbckBPWI" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2cE" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="slnbckBPWH" role="2OqNvi">
                                         <ref role="3TsBF5" to="vs0r:DubiFAXCMb" resolve="reexport" />
@@ -10699,9 +10699,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="slnbckBPWI" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2cE" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="slnbckBPWJ" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2cF" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -10881,7 +10881,7 @@
                           </node>
                           <node concept="2OqwBi" id="6niK5Rch1jM" role="3uHU7B">
                             <node concept="37vLTw" id="6niK5Rch0Zh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6niK5Rch0SU" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2cG" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6niK5Rch1Iw" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:71UKpntog8q" resolve="portAdater" />
@@ -10890,9 +10890,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6niK5Rch0SU" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2cG" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6niK5Rch0SV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2cH" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -11649,7 +11649,7 @@
                             <node concept="2OqwBi" id="6kTuxKCLGAM" role="3uHU7B">
                               <node concept="2OqwBi" id="6kTuxKCLvNA" role="2Oq$k0">
                                 <node concept="37vLTw" id="6kTuxKCLvil" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6kTuxKCLukQ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2cI" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6kTuxKCLAiW" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3VBG7bJfS4Y" resolve="portRefExpr" />
@@ -11662,9 +11662,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6kTuxKCLukQ" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2cI" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6kTuxKCLukR" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2cJ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11758,7 +11758,7 @@
                             <node concept="2OqwBi" id="6kTuxKCJIq4" role="3uHU7B">
                               <node concept="2OqwBi" id="6kTuxKCJyFU" role="2Oq$k0">
                                 <node concept="37vLTw" id="6kTuxKCJycm" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6kTuxKCJxYi" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2cK" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6kTuxKCJCPT" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:Z4PF258VgS" resolve="portExpr" />
@@ -11771,9 +11771,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6kTuxKCJxYi" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2cK" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6kTuxKCJxYj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2cL" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps
index 366c9536b98..bc973651773 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps
@@ -2,10 +2,10 @@
 <model ref="r:0d50476e-dbdf-49c3-8f0d-2b0350a5f1c6(com.mbeddr.ext.components.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
@@ -75,7 +75,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -84,7 +84,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -101,7 +101,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -129,7 +129,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -169,7 +169,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -185,7 +185,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -206,6 +206,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -213,7 +214,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -228,7 +229,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -270,7 +271,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -636,9 +636,9 @@
                                     <node concept="2OqwBi" id="1KUoCipvF4d" role="25WWJ7">
                                       <node concept="3$u5V9" id="1KUoCipvF4e" role="2OqNvi">
                                         <node concept="1bVj0M" id="1KUoCipvF4f" role="23t8la">
-                                          <node concept="Rh6nW" id="1KUoCipvF4g" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN2AK" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="1KUoCipvF4h" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN2AL" role="1tU5fm" />
                                           </node>
                                           <node concept="3clFbS" id="1KUoCipvF4i" role="1bW5cS">
                                             <node concept="3clFbF" id="1KUoCipvF4k" role="3cqZAp">
@@ -646,7 +646,7 @@
                                                 <node concept="1pGfFk" id="1KUoCipvF4m" role="2ShVmc">
                                                   <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
                                                   <node concept="37vLTw" id="2BHiRxglEoD" role="37wK5m">
-                                                    <ref role="3cqZAo" node="1KUoCipvF4g" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2AK" resolve="it" />
                                                   </node>
                                                 </node>
                                               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd
index 91088ae5788..29a73249176 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.components.pluginSolution" uuid="86788f45-66ec-4c79-8d58-36c6b710e314" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.ext.components.pluginSolution" uuid="86788f45-66ec-4c79-8d58-36c6b710e314" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -28,11 +27,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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
@@ -87,7 +86,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
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 f718c604da0..be3dd5725bd 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
@@ -45,7 +45,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -111,7 +111,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -138,7 +137,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -158,7 +156,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -243,7 +241,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/flatteningCompComps/util.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/flatteningCompComps/util.mps
index b7ceae01f50..dffff1b28fc 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/flatteningCompComps/util.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/flatteningCompComps/util.mps
@@ -102,7 +102,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -129,6 +129,7 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -206,7 +207,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -244,7 +245,6 @@
         <child id="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -639,7 +639,7 @@
                           <node concept="2OqwBi" id="3KKPUg5zf4G" role="2Oq$k0">
                             <node concept="2OqwBi" id="3KKPUg5zdTw" role="2Oq$k0">
                               <node concept="37vLTw" id="3KKPUg5zdPa" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3ejBUtVm41D" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2e7" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3KKPUg5zeyu" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v7ag:F_QT7XsuCu" resolve="field" />
@@ -655,9 +655,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm41D" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2e7" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm41E" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2e8" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1121,7 +1121,7 @@
                             <ref role="37wK5l" node="7mgpfAOtD6G" resolve="handleInstanceUpdate" />
                             <ref role="1Pybhc" node="3ejBUtVm40x" resolve="GeneratorUtil" />
                             <node concept="37vLTw" id="7mgpfAOtM1A" role="37wK5m">
-                              <ref role="3cqZAo" node="7mgpfAOtzmf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2e9" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="7mgpfAOFTaS" role="37wK5m">
                               <ref role="3cqZAo" node="3ejBUtVm42T" resolve="initialPrefix" />
@@ -1129,9 +1129,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7mgpfAOtzmf" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2e9" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7mgpfAOtzmg" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2ea" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2485,7 +2485,7 @@
                                 <node concept="2OqwBi" id="fLtBvqj1Dr" role="3clFbG">
                                   <node concept="2OqwBi" id="fLtBvqj1Ds" role="2Oq$k0">
                                     <node concept="37vLTw" id="fLtBvqj1Dt" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="fLtBvqj1Dz" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2eb" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="fLtBvqj1Du" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2505,9 +2505,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="fLtBvqj1Dz" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2eb" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="fLtBvqj1D$" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2ec" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2539,7 +2539,7 @@
                             </node>
                             <node concept="2OqwBi" id="fLtBvqdXXD" role="3uHU7B">
                               <node concept="37vLTw" id="fLtBvqdXOD" role="2Oq$k0">
-                                <ref role="3cqZAo" node="fLtBvqdXyR" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2ed" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="fLtBvqdYxb" role="2OqNvi">
                                 <ref role="3Tt5mk" to="g88q:6JVEnxIiE77" resolve="outsidePort" />
@@ -2548,9 +2548,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="fLtBvqdXyR" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ed" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="fLtBvqdXyS" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2ee" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2642,7 +2642,7 @@
                                       <property role="3cmrfH" value="0" />
                                     </node>
                                     <node concept="37vLTw" id="3ejBUtVm47C" role="1LFl5Q">
-                                      <ref role="3cqZAo" node="3ejBUtVm47X" resolve="delegationTarget" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2ef" resolve="delegationTarget" />
                                     </node>
                                   </node>
                                 </node>
@@ -2658,7 +2658,7 @@
                                       <property role="3cmrfH" value="1" />
                                     </node>
                                     <node concept="37vLTw" id="3ejBUtVm47I" role="1LFl5Q">
-                                      <ref role="3cqZAo" node="3ejBUtVm47X" resolve="delegationTarget" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2ef" resolve="delegationTarget" />
                                     </node>
                                   </node>
                                 </node>
@@ -2700,9 +2700,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3ejBUtVm47X" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2ef" role="1bW2Oz">
                               <property role="TrG5h" value="delegationTarget" />
-                              <node concept="2jxLKc" id="3ejBUtVm47Y" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2eg" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/template/main@generator.mps
index 3e606f20e51..c97f240b98b 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/generator/template/com/mbeddr/ext/compositecomponents/generator/template/main@generator.mps
@@ -110,7 +110,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -125,7 +125,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -198,6 +198,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -227,14 +228,14 @@
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
@@ -324,7 +325,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -382,7 +383,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -422,7 +423,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -701,7 +701,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6AXziRbQW5s" role="33vP2m">
                                   <node concept="37vLTw" id="6AXziRbQW5t" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6AXziRbQW5J" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2eh" resolve="it" />
                                   </node>
                                   <node concept="3AY5_j" id="6AXziRbQW5u" role="2OqNvi" />
                                 </node>
@@ -748,9 +748,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6AXziRbQW5J" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2eh" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6AXziRbQW5K" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2ei" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -983,15 +983,15 @@
                                       <node concept="3clFbF" id="6AXziRbTt4P" role="3cqZAp">
                                         <node concept="2OqwBi" id="6AXziRbTt9b" role="3clFbG">
                                           <node concept="37vLTw" id="6AXziRbTt4O" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6AXziRbTt0N" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2ej" resolve="it" />
                                           </node>
                                           <node concept="1$rogu" id="6AXziRbTtFh" role="2OqNvi" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6AXziRbTt0N" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2ej" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6AXziRbTt0O" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2ek" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1024,7 +1024,7 @@
                         <node concept="2OqwBi" id="6AXziRbRlD2" role="3clFbG">
                           <node concept="2OqwBi" id="6AXziRbRkaq" role="2Oq$k0">
                             <node concept="37vLTw" id="6AXziRbRjQi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6AXziRbRjNN" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2el" resolve="it" />
                             </node>
                             <node concept="1mfA1w" id="6AXziRbRl1Q" role="2OqNvi" />
                           </node>
@@ -1036,9 +1036,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6AXziRbRjNN" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2el" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6AXziRbRjNO" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2em" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1383,7 +1383,7 @@
                               <node concept="2OqwBi" id="3ejBUtVm4bl" role="3clFbG">
                                 <node concept="2OqwBi" id="3ejBUtVm4bm" role="2Oq$k0">
                                   <node concept="37vLTw" id="3ejBUtVm4bn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3ejBUtVm4bt" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2en" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="3ejBUtVm4bo" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1403,9 +1403,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3ejBUtVm4bt" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2en" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3ejBUtVm4bu" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2eo" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1579,7 +1579,7 @@
                           </node>
                           <node concept="2OqwBi" id="3ejBUtVm4bT" role="3uHU7B">
                             <node concept="37vLTw" id="3ejBUtVm4bU" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ejBUtVm4bW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ep" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3ejBUtVm4bV" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -1588,9 +1588,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4bW" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ep" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4bX" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eq" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2106,7 +2106,7 @@
                                                     <ref role="cht4Q" to="g88q:6JVEnxIhbeK" resolve="CompositeComponent" />
                                                   </node>
                                                   <node concept="37vLTw" id="2qwvqnUvorE" role="1m5AlR">
-                                                    <ref role="3cqZAo" node="2qwvqnUvorM" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2er" resolve="it" />
                                                   </node>
                                                 </node>
                                                 <node concept="3TrcHB" id="2qwvqnUvorF" role="2OqNvi">
@@ -2122,7 +2122,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2qwvqnUvorI" role="3uHU7B">
                                               <node concept="37vLTw" id="2qwvqnUvorJ" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2qwvqnUvorM" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2er" resolve="it" />
                                               </node>
                                               <node concept="1mIQ4w" id="2qwvqnUvorK" role="2OqNvi">
                                                 <node concept="chp4Y" id="2qwvqnUvorL" role="cj9EA">
@@ -2133,9 +2133,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2qwvqnUvorM" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2er" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="2qwvqnUvorN" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2es" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -2172,7 +2172,7 @@
                                         <node concept="2OqwBi" id="2qwvqnUvos2" role="3clFbG">
                                           <node concept="2OqwBi" id="2qwvqnUvos3" role="2Oq$k0">
                                             <node concept="37vLTw" id="2qwvqnUvos4" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2qwvqnUvosk" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2ev" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="2qwvqnUvos5" role="2OqNvi">
                                               <ref role="37wK5l" to="eup9:29JE8qNu0TX" resolve="fieldInitializers" />
@@ -2186,7 +2186,7 @@
                                                     <node concept="2OqwBi" id="3KKPUg5zstB" role="2Oq$k0">
                                                       <node concept="2OqwBi" id="3KKPUg5zq2r" role="2Oq$k0">
                                                         <node concept="37vLTw" id="3KKPUg5zpKw" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="2qwvqnUvosi" resolve="it" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN2et" resolve="it" />
                                                         </node>
                                                         <node concept="3TrEf2" id="3KKPUg5zr4S" role="2OqNvi">
                                                           <ref role="3Tt5mk" to="v7ag:F_QT7XsuCu" resolve="field" />
@@ -2202,18 +2202,18 @@
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="Rh6nW" id="2qwvqnUvosi" role="1bW2Oz">
+                                              <node concept="gl6BB" id="2SR9xrsN2et" role="1bW2Oz">
                                                 <property role="TrG5h" value="it" />
-                                                <node concept="2jxLKc" id="2qwvqnUvosj" role="1tU5fm" />
+                                                <node concept="2jxLKc" id="2SR9xrsN2eu" role="1tU5fm" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="2qwvqnUvosk" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2ev" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="2qwvqnUvosl" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2ew" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -2394,7 +2394,7 @@
                                                 </node>
                                                 <node concept="2OqwBi" id="2qwvqnUvot6" role="1m5AlR">
                                                   <node concept="37vLTw" id="2qwvqnUvot7" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="2qwvqnUvoth" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2ex" resolve="it" />
                                                   </node>
                                                   <node concept="3TrEf2" id="2qwvqnUvot8" role="2OqNvi">
                                                     <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -2414,7 +2414,7 @@
                                         <node concept="2OqwBi" id="3KKPUg5zCsK" role="3uHU7B">
                                           <node concept="2OqwBi" id="3KKPUg5z_vv" role="2Oq$k0">
                                             <node concept="37vLTw" id="3KKPUg5z_gb" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2qwvqnUvoth" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2ex" resolve="it" />
                                             </node>
                                             <node concept="3CFZ6_" id="3KKPUg5zB17" role="2OqNvi">
                                               <node concept="3CFYIy" id="3KKPUg5zBAs" role="3CFYIz">
@@ -2427,9 +2427,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="2qwvqnUvoth" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2ex" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="2qwvqnUvoti" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2ey" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -3458,15 +3458,15 @@
                       <node concept="3clFbF" id="3ejBUtVm4kD" role="3cqZAp">
                         <node concept="2OqwBi" id="3ejBUtVm4kE" role="3clFbG">
                           <node concept="37vLTw" id="3ejBUtVm4kF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3ejBUtVm4kH" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2ez" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="70U824pghud" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4kH" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ez" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4kI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2e$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3549,15 +3549,15 @@
                           <ref role="37wK5l" to="uj8d:3ejBUtVm45k" resolve="handleAdapterPortRef" />
                           <ref role="1Pybhc" to="uj8d:3ejBUtVm40x" resolve="GeneratorUtil" />
                           <node concept="37vLTw" id="3ejBUtVm4kW" role="37wK5m">
-                            <ref role="3cqZAo" node="3ejBUtVm4kY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2e_" resolve="it" />
                           </node>
                           <node concept="Xl_RD" id="3ejBUtVm4kX" role="37wK5m" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4kY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2e_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4kZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eA" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3602,7 +3602,7 @@
                           <ref role="1Pybhc" to="uj8d:3ejBUtVm40x" resolve="GeneratorUtil" />
                           <ref role="37wK5l" to="uj8d:7mgpfAOtD6G" resolve="handleInstanceUpdate" />
                           <node concept="37vLTw" id="7mgpfAOtM1A" role="37wK5m">
-                            <ref role="3cqZAo" node="7mgpfAOtzmf" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2eB" resolve="it" />
                           </node>
                           <node concept="Xl_RD" id="7mgpfAOHiSu" role="37wK5m">
                             <property role="Xl_RC" value="" />
@@ -3610,9 +3610,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7mgpfAOtzmf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2eB" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7mgpfAOtzmg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eC" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3674,7 +3674,7 @@
                         <node concept="3fqX7Q" id="3ejBUtVm4le" role="3clFbG">
                           <node concept="2OqwBi" id="3ejBUtVm4lf" role="3fr31v">
                             <node concept="37vLTw" id="3ejBUtVm4lg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ejBUtVm4li" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2eD" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="3ejBUtVm4lh" role="2OqNvi">
                               <ref role="37wK5l" to="eup9:5vJvKD7xsW0" resolve="isComponentAtomic" />
@@ -3683,9 +3683,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4li" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2eD" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4lj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3889,7 +3889,7 @@
                               <node concept="2OqwBi" id="3ejBUtVm4m7" role="3clFbG">
                                 <node concept="2OqwBi" id="3ejBUtVm4m8" role="2Oq$k0">
                                   <node concept="37vLTw" id="3ejBUtVm4m9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3ejBUtVm4md" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2eF" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="3ejBUtVm4ma" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3904,9 +3904,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3ejBUtVm4md" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2eF" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3ejBUtVm4me" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2eG" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4020,7 +4020,7 @@
                                   <node concept="2OqwBi" id="3ejBUtVm4mE" role="3clFbG">
                                     <node concept="2OqwBi" id="3ejBUtVm4mF" role="2Oq$k0">
                                       <node concept="37vLTw" id="3ejBUtVm4mG" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3ejBUtVm4mO" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2eH" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="3ejBUtVm4mH" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4045,9 +4045,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3ejBUtVm4mO" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2eH" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3ejBUtVm4mP" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2eI" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4264,7 +4264,7 @@
                         <node concept="2OqwBi" id="3KKPUg5D0HL" role="3clFbG">
                           <node concept="2OqwBi" id="3KKPUg5CZWb" role="2Oq$k0">
                             <node concept="37vLTw" id="3KKPUg5CZQI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ejBUtVm4nA" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2eJ" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="3KKPUg5D0pb" role="2OqNvi">
                               <node concept="3CFYIy" id="3KKPUg5D0xw" role="3CFYIz">
@@ -4276,9 +4276,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4nA" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2eJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4nB" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4398,7 +4398,7 @@
                         <node concept="2OqwBi" id="3KKPUg5CO5q" role="3clFbG">
                           <node concept="2OqwBi" id="3KKPUg5CNx$" role="2Oq$k0">
                             <node concept="37vLTw" id="3KKPUg5CNtP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ejBUtVm4or" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2eL" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="3KKPUg5CNOl" role="2OqNvi">
                               <node concept="3CFYIy" id="3KKPUg5CNV4" role="3CFYIz">
@@ -4410,9 +4410,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4or" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2eL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4os" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4526,7 +4526,7 @@
                         <node concept="2OqwBi" id="3KKPUg5CVKq" role="3clFbG">
                           <node concept="2OqwBi" id="3KKPUg5CVdp" role="2Oq$k0">
                             <node concept="37vLTw" id="3KKPUg5CVa0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ejBUtVm4pg" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2eN" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="3KKPUg5CVtv" role="2OqNvi">
                               <node concept="3CFYIy" id="3KKPUg5CV$Q" role="3CFYIz">
@@ -4538,9 +4538,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4pg" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2eN" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4ph" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eO" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4871,7 +4871,7 @@
                         <node concept="2OqwBi" id="3KKPUg5D7m3" role="3clFbG">
                           <node concept="2OqwBi" id="3KKPUg5D6_L" role="2Oq$k0">
                             <node concept="37vLTw" id="3KKPUg5D6x5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7mgpfAOCYHg" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2eP" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="3KKPUg5D75H" role="2OqNvi">
                               <node concept="3CFYIy" id="3KKPUg5D7dE" role="3CFYIz">
@@ -4883,9 +4883,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7mgpfAOCYHg" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2eP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7mgpfAOCYHh" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5394,7 +5394,7 @@
                           <node concept="3JPx81" id="3ejBUtVm4q4" role="2OqNvi">
                             <node concept="2OqwBi" id="3ejBUtVm4q5" role="25WWJ7">
                               <node concept="37vLTw" id="3ejBUtVm4q6" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3ejBUtVm4qM" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2eV" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="3ejBUtVm4q7" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5407,7 +5407,7 @@
                             <node concept="2OqwBi" id="3KKPUg5LT1x" role="3clFbG">
                               <node concept="2OqwBi" id="3KKPUg5LR0A" role="2Oq$k0">
                                 <node concept="37vLTw" id="3KKPUg5LQPZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3ejBUtVm4qM" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2eV" resolve="it" />
                                 </node>
                                 <node concept="3CFZ6_" id="3KKPUg5LS3O" role="2OqNvi">
                                   <node concept="3CFYIy" id="3KKPUg5LSxf" role="3CFYIz">
@@ -5586,7 +5586,7 @@
                                 <node concept="2OqwBi" id="3ejBUtVm4qp" role="2Oq$k0">
                                   <node concept="2OqwBi" id="3ejBUtVm4qq" role="2Oq$k0">
                                     <node concept="37vLTw" id="3ejBUtVm4qr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3ejBUtVm4qM" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2eV" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="29JE8qNu1ST" role="2OqNvi">
                                       <ref role="37wK5l" to="eup9:29JE8qNu0TX" resolve="fieldInitializers" />
@@ -5600,7 +5600,7 @@
                                             <node concept="2OqwBi" id="3KKPUg5zMwY" role="2Oq$k0">
                                               <node concept="2OqwBi" id="3KKPUg5zKZx" role="2Oq$k0">
                                                 <node concept="37vLTw" id="3KKPUg5zKSc" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3ejBUtVm4qB" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2eR" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="3KKPUg5zLGq" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="v7ag:F_QT7XsuCu" resolve="field" />
@@ -5616,9 +5616,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="3ejBUtVm4qB" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2eR" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="3ejBUtVm4qC" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2eS" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -5629,15 +5629,15 @@
                                       <node concept="3clFbF" id="3ejBUtVm4qG" role="3cqZAp">
                                         <node concept="2OqwBi" id="3ejBUtVm4qH" role="3clFbG">
                                           <node concept="37vLTw" id="3ejBUtVm4qI" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3ejBUtVm4qK" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2eT" resolve="it" />
                                           </node>
                                           <node concept="3YRAZt" id="70U824pghU8" role="2OqNvi" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3ejBUtVm4qK" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2eT" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="3ejBUtVm4qL" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2eU" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -5647,9 +5647,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3ejBUtVm4qM" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2eV" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3ejBUtVm4qN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2eW" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/behavior.mps
index da374f7e010..0f355bedebe 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/behavior.mps
@@ -140,7 +140,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -149,7 +149,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -170,6 +170,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -277,7 +278,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -314,7 +315,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1205598340672" name="jetbrains.mps.baseLanguage.collections.structure.DisjunctOperation" flags="nn" index="2NgGto" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
@@ -424,7 +424,7 @@
                     <node concept="3clFbF" id="6JVEnxIjbZs" role="3cqZAp">
                       <node concept="2OqwBi" id="6JVEnxIjbZM" role="3clFbG">
                         <node concept="37vLTw" id="6JVEnxIjbZt" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6JVEnxIjbZq" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2cM" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="6JVEnxIjbZS" role="2OqNvi">
                           <node concept="chp4Y" id="6JVEnxIjbZU" role="cj9EA">
@@ -434,9 +434,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6JVEnxIjbZq" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2cM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6JVEnxIjbZr" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2cN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -491,7 +491,7 @@
                     <node concept="3clFbF" id="2mhTzLJi8Q4" role="3cqZAp">
                       <node concept="2OqwBi" id="2mhTzLJi8Q5" role="3clFbG">
                         <node concept="37vLTw" id="2mhTzLJi8Q6" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2mhTzLJi8Q8" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2cO" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2mhTzLJi8Q7" role="2OqNvi">
                           <ref role="3Tt5mk" to="g88q:6JVEnxIiE77" resolve="outsidePort" />
@@ -499,9 +499,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2mhTzLJi8Q8" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2cO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2mhTzLJi8Q9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2cP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -539,7 +539,7 @@
                     <node concept="3clFbF" id="4FYctDz4pyj" role="3cqZAp">
                       <node concept="2OqwBi" id="4FYctDz4pyk" role="3clFbG">
                         <node concept="37vLTw" id="4FYctDz4pyl" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4FYctDz4pyn" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2cQ" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4FYctDz4pym" role="2OqNvi">
                           <ref role="3Tt5mk" to="g88q:6JVEnxIiE77" resolve="outsidePort" />
@@ -547,9 +547,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4FYctDz4pyn" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2cQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4FYctDz4pyo" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2cR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -697,7 +697,7 @@
                       </node>
                       <node concept="2OqwBi" id="3_MZZHrtYPx" role="3uHU7B">
                         <node concept="37vLTw" id="3_MZZHrtYPy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3_MZZHrtYP$" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2cS" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3_MZZHrtYPz" role="2OqNvi">
                           <ref role="3Tt5mk" to="g88q:6JVEnxIiE77" resolve="outsidePort" />
@@ -706,9 +706,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3_MZZHrtYP$" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2cS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3_MZZHrtYP_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2cT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -918,7 +918,7 @@
                                     <ref role="37wK5l" node="3_MZZHrtYKG" resolve="isDelegated" />
                                     <node concept="1PxgMI" id="Kov5PvPeH7" role="37wK5m">
                                       <node concept="37vLTw" id="Kov5PvPeH8" role="1m5AlR">
-                                        <ref role="3cqZAo" node="3_MZZHrtZ9P" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2cU" resolve="it" />
                                       </node>
                                       <node concept="chp4Y" id="79i$vAY79Q$" role="3oSUPX">
                                         <ref role="cht4Q" to="v7ag:3TmmsQkD8YC" resolve="ProvidedPort" />
@@ -927,7 +927,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="Kov5PvPeH9" role="3uHU7B">
                                     <node concept="37vLTw" id="Kov5PvPeHa" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3_MZZHrtZ9P" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2cU" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="Kov5PvPeHb" role="2OqNvi">
                                       <node concept="chp4Y" id="Kov5PvPeHc" role="cj9EA">
@@ -941,7 +941,7 @@
                             <node concept="3fqX7Q" id="3_MZZHrtZap" role="3uHU7B">
                               <node concept="2OqwBi" id="3_MZZHrtZaq" role="3fr31v">
                                 <node concept="37vLTw" id="3_MZZHrtZar" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3_MZZHrtZ9P" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2cU" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="3_MZZHrtZas" role="2OqNvi">
                                   <node concept="chp4Y" id="3_MZZHrtZat" role="cj9EA">
@@ -953,9 +953,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3_MZZHrtZ9P" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2cU" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3_MZZHrtZ9Q" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2cV" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -966,15 +966,15 @@
                       <node concept="3clFbF" id="5vJvKD7xfQh" role="3cqZAp">
                         <node concept="2OqwBi" id="5vJvKD7xfQB" role="3clFbG">
                           <node concept="37vLTw" id="5vJvKD7xfQi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5vJvKD7xfQf" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2cW" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="5vJvKD7xfQH" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5vJvKD7xfQf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2cW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5vJvKD7xfQg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2cX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1064,7 +1064,7 @@
                                 <node concept="2OqwBi" id="5vJvKD7xglt" role="3clFbG">
                                   <node concept="2OqwBi" id="5vJvKD7xgl2" role="2Oq$k0">
                                     <node concept="37vLTw" id="5vJvKD7xgkH" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5vJvKD7xgkE" resolve="field" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2cY" resolve="field" />
                                     </node>
                                     <node concept="3TrcHB" id="5vJvKD7xgl7" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1075,7 +1075,7 @@
                                     <node concept="2OqwBi" id="5vJvKD7xgmN" role="37wK5m">
                                       <node concept="2OqwBi" id="5vJvKD7xgmn" role="2Oq$k0">
                                         <node concept="37vLTw" id="5vJvKD7xgm2" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5vJvKD7xgiU" resolve="fieldRef" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2d0" resolve="fieldRef" />
                                         </node>
                                         <node concept="3TrEf2" id="5vJvKD7xgmt" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:4AGl5dzwUZU" resolve="field" />
@@ -1089,16 +1089,16 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5vJvKD7xgkE" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2cY" role="1bW2Oz">
                               <property role="TrG5h" value="field" />
-                              <node concept="2jxLKc" id="5vJvKD7xgkF" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2cZ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                       <node concept="2OqwBi" id="5vJvKD7xgji" role="37vLTJ">
                         <node concept="37vLTw" id="5vJvKD7xgiX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5vJvKD7xgiU" resolve="fieldRef" />
+                          <ref role="3cqZAo" node="2SR9xrsN2d0" resolve="fieldRef" />
                         </node>
                         <node concept="3TrEf2" id="5vJvKD7xgjo" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:4AGl5dzwUZU" resolve="field" />
@@ -1107,9 +1107,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5vJvKD7xgiU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2d0" role="1bW2Oz">
                   <property role="TrG5h" value="fieldRef" />
-                  <node concept="2jxLKc" id="5vJvKD7xgiV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2d1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1150,7 +1150,7 @@
                                 <node concept="2OqwBi" id="5vJvKD7xgne" role="3clFbG">
                                   <node concept="2OqwBi" id="5vJvKD7xgnf" role="2Oq$k0">
                                     <node concept="37vLTw" id="5vJvKD7xgng" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5vJvKD7xgno" resolve="field" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2d2" resolve="field" />
                                     </node>
                                     <node concept="3TrcHB" id="5vJvKD7xgnh" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1161,7 +1161,7 @@
                                     <node concept="2OqwBi" id="5vJvKD7xgnj" role="37wK5m">
                                       <node concept="2OqwBi" id="5vJvKD7xgnk" role="2Oq$k0">
                                         <node concept="37vLTw" id="5vJvKD7xgnl" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5vJvKD7xgnt" resolve="portRef" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2d4" resolve="portRef" />
                                         </node>
                                         <node concept="3TrEf2" id="5vJvKD7xgnA" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:71UKpntoTuF" resolve="port" />
@@ -1175,16 +1175,16 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5vJvKD7xgno" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2d2" role="1bW2Oz">
                               <property role="TrG5h" value="field" />
-                              <node concept="2jxLKc" id="5vJvKD7xgnp" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2d3" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                       <node concept="2OqwBi" id="5vJvKD7xgnq" role="37vLTJ">
                         <node concept="37vLTw" id="5vJvKD7xgnr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5vJvKD7xgnt" resolve="portRef" />
+                          <ref role="3cqZAo" node="2SR9xrsN2d4" resolve="portRef" />
                         </node>
                         <node concept="3TrEf2" id="5vJvKD7xgny" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:71UKpntoTuF" resolve="port" />
@@ -1193,9 +1193,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5vJvKD7xgnt" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2d4" role="1bW2Oz">
                   <property role="TrG5h" value="portRef" />
-                  <node concept="2jxLKc" id="5vJvKD7xgnu" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2d5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1236,7 +1236,7 @@
                                 <node concept="2OqwBi" id="4dKKrcEaHue" role="3clFbG">
                                   <node concept="2OqwBi" id="4dKKrcEaHuf" role="2Oq$k0">
                                     <node concept="37vLTw" id="4dKKrcEaHug" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4dKKrcEaHuo" resolve="pp" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2d6" resolve="pp" />
                                     </node>
                                     <node concept="3TrcHB" id="4dKKrcEaHuh" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1247,7 +1247,7 @@
                                     <node concept="2OqwBi" id="4dKKrcEaHuj" role="37wK5m">
                                       <node concept="2OqwBi" id="4dKKrcEaHuk" role="2Oq$k0">
                                         <node concept="37vLTw" id="4dKKrcEaHul" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4dKKrcEaHut" resolve="opTrigger" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2d8" resolve="opTrigger" />
                                         </node>
                                         <node concept="3TrEf2" id="4dKKrcEaSrX" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:3U_nJP19H_S" resolve="providedPort" />
@@ -1261,16 +1261,16 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4dKKrcEaHuo" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2d6" role="1bW2Oz">
                               <property role="TrG5h" value="pp" />
-                              <node concept="2jxLKc" id="4dKKrcEaHup" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2d7" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                       <node concept="2OqwBi" id="4dKKrcEaHuq" role="37vLTJ">
                         <node concept="37vLTw" id="4dKKrcEaHur" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4dKKrcEaHut" resolve="opTrigger" />
+                          <ref role="3cqZAo" node="2SR9xrsN2d8" resolve="opTrigger" />
                         </node>
                         <node concept="3TrEf2" id="4dKKrcEaKAY" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:3U_nJP19H_S" resolve="providedPort" />
@@ -1279,9 +1279,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4dKKrcEaHut" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2d8" role="1bW2Oz">
                   <property role="TrG5h" value="opTrigger" />
-                  <node concept="2jxLKc" id="4dKKrcEaHuu" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2d9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1322,7 +1322,7 @@
                                 <node concept="2OqwBi" id="5sHAGxmMJWS" role="3clFbG">
                                   <node concept="2OqwBi" id="5sHAGxmMJWT" role="2Oq$k0">
                                     <node concept="37vLTw" id="5sHAGxmMJWU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5sHAGxmMJX2" resolve="r" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2da" resolve="r" />
                                     </node>
                                     <node concept="3TrcHB" id="5sHAGxmMJWV" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1333,7 +1333,7 @@
                                     <node concept="2OqwBi" id="5sHAGxmMJWX" role="37wK5m">
                                       <node concept="2OqwBi" id="5sHAGxmMJWY" role="2Oq$k0">
                                         <node concept="37vLTw" id="5sHAGxmMJWZ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5sHAGxmMJX7" resolve="call" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2dc" resolve="call" />
                                         </node>
                                         <node concept="3TrEf2" id="5sHAGxmNbl1" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:18l4N2QwFku" resolve="runnable" />
@@ -1347,16 +1347,16 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5sHAGxmMJX2" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2da" role="1bW2Oz">
                               <property role="TrG5h" value="r" />
-                              <node concept="2jxLKc" id="5sHAGxmMJX3" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2db" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                       <node concept="2OqwBi" id="5sHAGxmMJX4" role="37vLTJ">
                         <node concept="37vLTw" id="5sHAGxmMJX5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5sHAGxmMJX7" resolve="call" />
+                          <ref role="3cqZAo" node="2SR9xrsN2dc" resolve="call" />
                         </node>
                         <node concept="3TrEf2" id="5sHAGxmMTKu" role="2OqNvi">
                           <ref role="3Tt5mk" to="v7ag:18l4N2QwFku" resolve="runnable" />
@@ -1365,9 +1365,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5sHAGxmMJX7" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2dc" role="1bW2Oz">
                   <property role="TrG5h" value="call" />
-                  <node concept="2jxLKc" id="5sHAGxmMJX8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2dd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1642,7 +1642,7 @@
                         <node concept="2OqwBi" id="2E5EJrZm$gZ" role="2Oq$k0">
                           <node concept="2OqwBi" id="3xn9VoOUiyp" role="2Oq$k0">
                             <node concept="37vLTw" id="3xn9VoOUiyq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3xn9VoOUiys" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2de" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2E5EJrZmtsK" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -1656,7 +1656,7 @@
                           <ref role="37wK5l" to="eup9:3LPPE_giCuF" resolve="allReferencedProvidedPortsWithContext" />
                           <node concept="2OqwBi" id="2E5EJrZmJgl" role="37wK5m">
                             <node concept="37vLTw" id="2E5EJrZmHH9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3xn9VoOUiys" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2de" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2E5EJrZmRnN" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1666,9 +1666,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3xn9VoOUiys" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2de" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3xn9VoOUiyt" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2df" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1697,7 +1697,7 @@
                                   <node concept="3cpWs3" id="2E5EJrYXgKp" role="3uHU7B">
                                     <node concept="2OqwBi" id="2E5EJrYXiOJ" role="3uHU7B">
                                       <node concept="37vLTw" id="2E5EJrYXhF6" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3xn9VoOUNNL" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2dg" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="2E5EJrZnl3e" role="2OqNvi">
                                         <ref role="3TsBF5" to="v7ag:2E5EJrUmcRQ" resolve="instanceName" />
@@ -1710,7 +1710,7 @@
                                   <node concept="2OqwBi" id="2E5EJrYWXgr" role="3uHU7w">
                                     <node concept="2OqwBi" id="3xn9VoOVdsB" role="2Oq$k0">
                                       <node concept="37vLTw" id="3xn9VoOVc63" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3xn9VoOUNNL" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2dg" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2E5EJrYWJw3" role="2OqNvi">
                                         <ref role="3Tt5mk" to="v7ag:2E5EJrUmcRJ" resolve="providedPort" />
@@ -1733,7 +1733,7 @@
                                     <node concept="2OqwBi" id="2E5EJrYXXT8" role="36biLW">
                                       <node concept="2OqwBi" id="3xn9VoOVTdj" role="2Oq$k0">
                                         <node concept="37vLTw" id="3xn9VoOVS3O" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3xn9VoOUNNL" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2dg" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="2E5EJrYXJZi" role="2OqNvi">
                                           <ref role="3Tt5mk" to="v7ag:2E5EJrUmcRJ" resolve="providedPort" />
@@ -1753,9 +1753,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3xn9VoOUNNL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2dg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3xn9VoOUNNM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2dh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1791,7 +1791,7 @@
                           <node concept="2OqwBi" id="5vJvKD7x8Nf" role="2Oq$k0">
                             <node concept="1PxgMI" id="5vJvKD7x8MT" role="2Oq$k0">
                               <node concept="37vLTw" id="5vJvKD7x8Ma" role="1m5AlR">
-                                <ref role="3cqZAo" node="5vJvKD7x8Lj" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2di" resolve="it" />
                               </node>
                               <node concept="chp4Y" id="79i$vAY79QE" role="3oSUPX">
                                 <ref role="cht4Q" to="v7ag:3TmmsQkDdTN" resolve="AtomicComponent" />
@@ -1810,7 +1810,7 @@
                         </node>
                         <node concept="2OqwBi" id="5vJvKD7x8LF" role="3uHU7B">
                           <node concept="37vLTw" id="5vJvKD7x8Lm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5vJvKD7x8Lj" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2di" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5vJvKD7x8LK" role="2OqNvi">
                             <node concept="chp4Y" id="5vJvKD7x8LM" role="cj9EA">
@@ -1821,9 +1821,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5vJvKD7x8Lj" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2di" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5vJvKD7x8Lk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2dj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2009,7 +2009,7 @@
                           <node concept="2OqwBi" id="5vJvKD7xN60" role="2Oq$k0">
                             <node concept="1PxgMI" id="5vJvKD7xN5E" role="2Oq$k0">
                               <node concept="37vLTw" id="5vJvKD7xN5l" role="1m5AlR">
-                                <ref role="3cqZAo" node="5vJvKD7xN4t" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2dk" resolve="it" />
                               </node>
                               <node concept="chp4Y" id="79i$vAY79QJ" role="3oSUPX">
                                 <ref role="cht4Q" to="v7ag:3TmmsQkDdTQ" resolve="ComponentInstance" />
@@ -2028,7 +2028,7 @@
                         </node>
                         <node concept="2OqwBi" id="5vJvKD7xN4P" role="3uHU7B">
                           <node concept="37vLTw" id="5vJvKD7xN4w" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5vJvKD7xN4t" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2dk" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5vJvKD7xN4V" role="2OqNvi">
                             <node concept="chp4Y" id="5vJvKD7xN4X" role="cj9EA">
@@ -2039,9 +2039,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5vJvKD7xN4t" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2dk" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5vJvKD7xN4u" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2dl" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2123,7 +2123,7 @@
                         </node>
                         <node concept="2OqwBi" id="5vJvKD7xQKF" role="3uHU7B">
                           <node concept="37vLTw" id="5vJvKD7xQKG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5vJvKD7xQKI" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2dm" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5vJvKD7xQKH" role="2OqNvi">
                             <ref role="3Tt5mk" to="g88q:6JVEnxIiE77" resolve="outsidePort" />
@@ -2132,9 +2132,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5vJvKD7xQKI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2dm" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5vJvKD7xQKJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2dn" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2146,7 +2146,7 @@
                     <node concept="1Ls8ON" id="5vJvKD7xQN3" role="3clFbG">
                       <node concept="2OqwBi" id="5vJvKD7xQN4" role="1Lso8e">
                         <node concept="37vLTw" id="5vJvKD7xQN5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5vJvKD7xQNa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2do" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5vJvKD7xQN6" role="2OqNvi">
                           <ref role="3Tt5mk" to="g88q:6JVEnxIiRsX" resolve="internalInstance" />
@@ -2154,7 +2154,7 @@
                       </node>
                       <node concept="2OqwBi" id="5vJvKD7xQN7" role="1Lso8e">
                         <node concept="37vLTw" id="5vJvKD7xQN8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5vJvKD7xQNa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2do" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5vJvKD7xQN9" role="2OqNvi">
                           <ref role="3Tt5mk" to="g88q:6JVEnxIiRsY" resolve="internalPort" />
@@ -2163,9 +2163,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5vJvKD7xQNa" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2do" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5vJvKD7xQNb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2dp" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2328,7 +2328,7 @@
                     <node concept="3clFbF" id="3_MZZHrtYMk" role="3cqZAp">
                       <node concept="2OqwBi" id="3_MZZHrtYME" role="3clFbG">
                         <node concept="37vLTw" id="3_MZZHrtYMl" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3_MZZHrtYMi" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2dq" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3_MZZHrtYMK" role="2OqNvi">
                           <node concept="chp4Y" id="3_MZZHrtYMM" role="cj9EA">
@@ -2338,9 +2338,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3_MZZHrtYMi" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2dq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3_MZZHrtYMj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2dr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/constraints.mps
index 70d5a38f691..f39f08c6f37 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/constraints.mps
@@ -69,7 +69,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -103,6 +103,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -150,7 +151,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -161,7 +162,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -320,7 +320,7 @@
                                 <node concept="2OqwBi" id="5CkU_dHiqN8" role="3uHU7w">
                                   <node concept="2yIwOk" id="5CkU_dHiqN9" role="2OqNvi" />
                                   <node concept="37vLTw" id="5CkU_dHiqNa" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5CkU_dHiqNk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ds" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -338,7 +338,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5CkU_dHiqNh" role="3uHU7B">
                                   <node concept="37vLTw" id="5CkU_dHiqNi" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5CkU_dHiqNk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ds" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5CkU_dHiqNj" role="2OqNvi">
                                     <ref role="3Tt5mk" to="v7ag:3TmmsQkC_Q4" resolve="intf" />
@@ -348,9 +348,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHiqNk" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2ds" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHiqNl" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2dt" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
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 d043c3a0f03..129d640f8fc 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
@@ -348,6 +348,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -562,7 +563,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -707,7 +707,7 @@
                           <node concept="2OqwBi" id="6JVEnxIj1Hs" role="2Oq$k0">
                             <node concept="2OqwBi" id="6JVEnxIj1GV" role="2Oq$k0">
                               <node concept="37vLTw" id="6JVEnxIj1GA" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6JVEnxIj1Gz" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2du" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6JVEnxIj1H6" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -721,9 +721,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6JVEnxIj1Gz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2du" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6JVEnxIj1G$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2dv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1103,7 +1103,7 @@
                             <node concept="1PxgMI" id="2$xXL4HD1E_" role="2Oq$k0">
                               <node concept="2OqwBi" id="2$xXL4HCU73" role="1m5AlR">
                                 <node concept="37vLTw" id="2$xXL4HCTG9" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2dw" resolve="it" />
                                 </node>
                                 <node concept="1mfA1w" id="2$xXL4HCZxY" role="2OqNvi" />
                               </node>
@@ -1120,7 +1120,7 @@
                         <node concept="2OqwBi" id="2Fugwv5Y8es" role="3uHU7B">
                           <node concept="2OqwBi" id="2$xXL4HtRNL" role="2Oq$k0">
                             <node concept="37vLTw" id="2$xXL4HtRNM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2dw" resolve="it" />
                             </node>
                             <node concept="2NL2c5" id="2Fugwv5Y4rh" role="2OqNvi" />
                           </node>
@@ -1132,7 +1132,7 @@
                       <node concept="2OqwBi" id="2$xXL4HtRNO" role="3uHU7B">
                         <node concept="2OqwBi" id="2$xXL4HtRNP" role="2Oq$k0">
                           <node concept="37vLTw" id="2$xXL4HtRNQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2$xXL4HtRNU" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2dw" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="2$xXL4HtRNR" role="2OqNvi" />
                         </node>
@@ -1145,9 +1145,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2$xXL4HtRNU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2dw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2$xXL4HtRNV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2dx" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1263,7 +1263,7 @@
                           <node concept="2OqwBi" id="3nAucCghSvR" role="2Oq$k0">
                             <node concept="2OqwBi" id="3nAucCghSvS" role="2Oq$k0">
                               <node concept="37vLTw" id="3nAucCghSvT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3nAucCghSvX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2dy" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3nAucCghSvU" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -1277,9 +1277,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3nAucCghSvX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2dy" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3nAucCghSvY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2dz" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1351,7 +1351,7 @@
                               <ref role="ehGHo" to="v7ag:3TmmsQkCzn9" resolve="Component" />
                             </node>
                             <node concept="37vLTw" id="6rHj_ILOk52" role="33vP2m">
-                              <ref role="3cqZAo" node="6rHj_ILOgVu" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2d$" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -1497,9 +1497,9 @@
                         </node>
                         <node concept="3clFbH" id="6rHj_ILOhqd" role="3cqZAp" />
                       </node>
-                      <node concept="Rh6nW" id="6rHj_ILOgVu" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2d$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6rHj_ILOgVv" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2d_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1842,7 +1842,7 @@
                                 <node concept="1$Yqjh" id="6rHj_ILQx9o" role="3uHU7w" />
                                 <node concept="2OqwBi" id="6rHj_ILQvrC" role="3uHU7B">
                                   <node concept="37vLTw" id="6rHj_ILQv6l" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6rHj_ILQuJQ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2dA" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="6rHj_ILQw4l" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1851,9 +1851,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6rHj_ILQuJQ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2dA" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6rHj_ILQuJR" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2dB" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1922,7 +1922,7 @@
                                 <node concept="1$Yrgj" id="6rHj_ILQIR3" role="3uHU7w" />
                                 <node concept="2OqwBi" id="6rHj_ILQHrL" role="3uHU7B">
                                   <node concept="37vLTw" id="6rHj_ILQH6u" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6rHj_ILQGJZ" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2dC" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="6rHj_ILQI4r" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1931,9 +1931,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6rHj_ILQGJZ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2dC" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6rHj_ILQGK0" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2dD" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1973,7 +1973,7 @@
                               <node concept="1$Yqjh" id="6rHj_ILQ7iS" role="3uHU7w" />
                               <node concept="2OqwBi" id="6rHj_ILQ5oN" role="3uHU7B">
                                 <node concept="37vLTw" id="6rHj_ILQ50R" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6rHj_ILQ4_J" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2dE" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6rHj_ILQ65A" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1982,9 +1982,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6rHj_ILQ4_J" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2dE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6rHj_ILQ4_K" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2dF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2015,7 +2015,7 @@
                               <node concept="1$Yrgj" id="6rHj_ILQaji" role="3uHU7w" />
                               <node concept="2OqwBi" id="6rHj_ILQ8dE" role="3uHU7B">
                                 <node concept="37vLTw" id="6rHj_ILQ8dF" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6rHj_ILQ8dH" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2dG" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6rHj_ILQ8dG" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2024,9 +2024,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6rHj_ILQ8dH" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2dG" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6rHj_ILQ8dI" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2dH" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2108,7 +2108,7 @@
                                 <node concept="1$Yrgj" id="6rHj_ILRwnF" role="3uHU7w" />
                                 <node concept="2OqwBi" id="6rHj_ILRuNu" role="3uHU7B">
                                   <node concept="37vLTw" id="6rHj_ILRuvP" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6rHj_ILRu9A" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2dI" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="6rHj_ILRvqy" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2117,9 +2117,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6rHj_ILRu9A" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2dI" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6rHj_ILRu9B" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2dJ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2165,7 +2165,7 @@
                                   <node concept="1$Yrgj" id="6rHj_ILRJA6" role="3uHU7w" />
                                   <node concept="2OqwBi" id="6rHj_ILRJA7" role="3uHU7B">
                                     <node concept="37vLTw" id="6rHj_ILRJA8" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6rHj_ILRJAa" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2dK" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="6rHj_ILRJA9" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2174,9 +2174,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6rHj_ILRJAa" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2dK" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6rHj_ILRJAb" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2dL" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2378,7 +2378,7 @@
                           <node concept="2OqwBi" id="7sHDEc2WDJu" role="3clFbG">
                             <node concept="2OqwBi" id="7sHDEc2WDJv" role="2Oq$k0">
                               <node concept="37vLTw" id="7sHDEc2WDJw" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7sHDEc2WDJ$" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2dM" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7sHDEc2WDJx" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2391,9 +2391,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7sHDEc2WDJ$" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2dM" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7sHDEc2WDJ_" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2dN" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/intentions.mps
index 1e20ac04203..a73104b9674 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/intentions.mps
@@ -73,7 +73,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -89,6 +89,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -177,7 +178,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -197,7 +198,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225621920911" name="jetbrains.mps.baseLanguage.collections.structure.InsertElementOperation" flags="nn" index="1sK_Qi">
         <child id="1225621943565" name="element" index="1sKFgg" />
@@ -492,7 +492,7 @@
                               </node>
                               <node concept="2OqwBi" id="7$_eEdIcG$T" role="3uHU7B">
                                 <node concept="37vLTw" id="7$_eEdIcG$L" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7$_eEdIcG$u" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2dO" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7$_eEdIcG$X" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3U_nJP19OhZ" resolve="calledOperation" />
@@ -503,7 +503,7 @@
                               <node concept="2Sf5sV" id="3$v$DpgBhnU" role="3uHU7w" />
                               <node concept="2OqwBi" id="3$v$DpgB9Eq" role="3uHU7B">
                                 <node concept="37vLTw" id="3$v$DpgB9E5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7$_eEdIcG$u" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2dO" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3$v$DpgBhnx" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3U_nJP19H_S" resolve="providedPort" />
@@ -513,9 +513,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7$_eEdIcG$u" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2dO" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7$_eEdIcG$v" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2dP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -601,11 +601,11 @@
                                     <node concept="1Wc70l" id="7dfuMW5RF$X" role="3clFbG">
                                       <node concept="3clFbC" id="7dfuMW5RF$Y" role="3uHU7w">
                                         <node concept="37vLTw" id="7dfuMW5RF$Z" role="3uHU7w">
-                                          <ref role="3cqZAo" node="7dfuMW5Ruhl" resolve="op" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2dS" resolve="op" />
                                         </node>
                                         <node concept="2OqwBi" id="7dfuMW5RF_0" role="3uHU7B">
                                           <node concept="37vLTw" id="7dfuMW5RF_1" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7dfuMW5RF_8" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2dQ" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="7dfuMW5RF_2" role="2OqNvi">
                                             <ref role="3Tt5mk" to="v7ag:3U_nJP19OhZ" resolve="calledOperation" />
@@ -615,7 +615,7 @@
                                       <node concept="3clFbC" id="7dfuMW5RF_3" role="3uHU7B">
                                         <node concept="2OqwBi" id="7dfuMW5RF_4" role="3uHU7B">
                                           <node concept="37vLTw" id="7dfuMW5RF_5" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7dfuMW5RF_8" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2dQ" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="7dfuMW5RF_6" role="2OqNvi">
                                             <ref role="3Tt5mk" to="v7ag:3U_nJP19H_S" resolve="providedPort" />
@@ -626,9 +626,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="7dfuMW5RF_8" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2dQ" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7dfuMW5RF_9" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2dR" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -636,9 +636,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7dfuMW5Ruhl" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2dS" role="1bW2Oz">
                       <property role="TrG5h" value="op" />
-                      <node concept="2jxLKc" id="7dfuMW5Ruhm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2dT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/structure.mps
index 054fdbb5e07..9076cf5aabf 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/structure.mps
@@ -61,7 +61,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/typesystem.mps
index 51c78e8a6e0..fe9a839e501 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/typesystem.mps
@@ -73,7 +73,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -89,6 +89,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -221,7 +222,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -245,7 +246,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -427,7 +427,7 @@
                                 <ref role="37wK5l" to="hwgx:6clJcrKt_a0" resolve="isReexported" />
                               </node>
                               <node concept="37vLTw" id="6qL8nDXpIDq" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6qL8nDXpIAe" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2dU" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -437,7 +437,7 @@
                                 <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
                               </node>
                               <node concept="37vLTw" id="6qL8nDXpIAh" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6qL8nDXpIAe" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2dU" resolve="it" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="6qL8nDXpIB5" role="3uHU7w">
@@ -447,9 +447,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6qL8nDXpIAe" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2dU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6qL8nDXpIAf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2dV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -484,15 +484,15 @@
                         <node concept="3CnSsL" id="36a7yl96IMF" role="3Coj4f">
                           <ref role="QkamJ" node="6qL8nDXpIFf" resolve="import" />
                           <node concept="37vLTw" id="36a7yl96IMG" role="3CoRuB">
-                            <ref role="3cqZAo" node="6qL8nDXpIDT" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2dW" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6qL8nDXpIDT" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2dW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6qL8nDXpIDU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2dX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -548,7 +548,7 @@
                             <property role="Xl_RC" value="Component must be exported because Composite Component is exported" />
                           </node>
                           <node concept="37vLTw" id="jSY5CLegmm" role="1urrMF">
-                            <ref role="3cqZAo" node="jSY5CLeglg" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2dY" resolve="it" />
                           </node>
                           <node concept="3Cnw8n" id="jSY5CLeh$P" role="1urrFz">
                             <ref role="QpYPw" node="jSY5CLegmn" resolve="exportComponent" />
@@ -556,7 +556,7 @@
                               <ref role="QkamJ" node="jSY5CLegmq" resolve="c" />
                               <node concept="2OqwBi" id="jSY5CLeh_d" role="3CoRuB">
                                 <node concept="37vLTw" id="jSY5CLeh$S" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="jSY5CLeglg" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2dY" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="jSY5CLeh_m" role="2OqNvi">
                                   <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -570,7 +570,7 @@
                         <node concept="2OqwBi" id="jSY5CLegm4" role="3fr31v">
                           <node concept="2OqwBi" id="jSY5CLeglC" role="2Oq$k0">
                             <node concept="37vLTw" id="jSY5CLeglj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="jSY5CLeglg" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2dY" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="jSY5CLeglI" role="2OqNvi">
                               <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTR" resolve="component" />
@@ -583,9 +583,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="jSY5CLeglg" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2dY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="jSY5CLeglh" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2dZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -888,7 +888,7 @@
                         <node concept="3clFbC" id="7moPk04GDeh" role="3uHU7w">
                           <node concept="2OqwBi" id="7moPk04GDv_" role="3uHU7w">
                             <node concept="37vLTw" id="7moPk04GDlg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7moPk04GtOA" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2e0" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4FYctDz5v5v" role="2OqNvi">
                               <ref role="3Tt5mk" to="g88q:6JVEnxIiE77" resolve="outsidePort" />
@@ -905,7 +905,7 @@
                         </node>
                         <node concept="3y3z36" id="7moPk04GtZr" role="3uHU7B">
                           <node concept="37vLTw" id="7moPk04GtRL" role="3uHU7B">
-                            <ref role="3cqZAo" node="7moPk04GtOA" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2e0" resolve="it" />
                           </node>
                           <node concept="2GrUjf" id="7moPk04Gu2s" role="3uHU7w">
                             <ref role="2Gs0qQ" node="7moPk04GqQa" resolve="dc" />
@@ -914,9 +914,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7moPk04GtOA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2e0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7moPk04GtOB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2e1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -947,7 +947,7 @@
                   <node concept="2OqwBi" id="4qGsbFhrm1d" role="3clFbG">
                     <node concept="2OqwBi" id="4qGsbFhrbiU" role="2Oq$k0">
                       <node concept="37vLTw" id="4qGsbFhrbaS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4qGsbFhrb6T" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2e2" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="4FYctDz5wIl" role="2OqNvi">
                         <ref role="3Tt5mk" to="g88q:6JVEnxIiE77" resolve="outsidePort" />
@@ -961,9 +961,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="4qGsbFhrb6T" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2e2" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="4qGsbFhrb6U" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2e3" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1476,7 +1476,7 @@
                                   <node concept="2OqwBi" id="K3KnZNFfr6" role="3uHU7B">
                                     <node concept="2OqwBi" id="K3KnZNFfr7" role="2Oq$k0">
                                       <node concept="37vLTw" id="K3KnZNFfr8" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="K3KnZNFfrb" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2e4" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="K3KnZNFfr9" role="2OqNvi">
                                         <ref role="3Tt5mk" to="v7ag:3TmmsQkDdTX" resolve="target" />
@@ -1489,9 +1489,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="K3KnZNFfrb" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2e4" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="K3KnZNFfrc" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2e5" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl
index dcba019e290..cbf3962ef94 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl
@@ -56,7 +56,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -127,7 +127,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -301,7 +300,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -346,7 +344,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -425,7 +423,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>b879012d-402b-40e0-8df7-e6fa93b9b711(com.mbeddr.ext.concurrency)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/generator/template/main@generator.mps
index ec702234f76..cd0cbad2fe6 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/generator/template/main@generator.mps
@@ -112,7 +112,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -151,7 +151,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -216,7 +216,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="7473026166162297915" name="jetbrains.mps.lang.generator.structure.DropAttributeRule" flags="lg" index="CY16f">
@@ -291,6 +291,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -379,7 +380,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -387,7 +388,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -502,7 +503,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -580,7 +581,7 @@
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
@@ -638,7 +639,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -3346,7 +3346,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="42ri$nZ0CJF" role="3uHU7B">
                                       <node concept="37vLTw" id="42ri$nZ0Cov" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="42ri$nYMPMr" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2fe" resolve="it" />
                                       </node>
                                       <node concept="2bSWHS" id="42ri$nZ0DoI" role="2OqNvi" />
                                     </node>
@@ -3362,7 +3362,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="42ri$nZ0HkK" role="3clFbw">
                                     <node concept="37vLTw" id="42ri$nZ0HkL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="42ri$nYMPMr" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2fe" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="42ri$nZ0HkM" role="2OqNvi">
                                       <node concept="chp4Y" id="42ri$nZ0HkN" role="cj9EA">
@@ -3382,7 +3382,7 @@
                                   <node concept="2OqwBi" id="42ri$nZ0JTX" role="3clFbw">
                                     <node concept="2OqwBi" id="42ri$nZ0JTY" role="2Oq$k0">
                                       <node concept="37vLTw" id="42ri$nZ0JTZ" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="42ri$nYMPMr" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2fe" resolve="it" />
                                       </node>
                                       <node concept="YBYNd" id="42ri$nZ0JU0" role="2OqNvi" />
                                     </node>
@@ -3404,7 +3404,7 @@
                                   <node concept="2OqwBi" id="42ri$nZ1$IJ" role="3clFbw">
                                     <node concept="2OqwBi" id="42ri$nZ1yOy" role="2Oq$k0">
                                       <node concept="37vLTw" id="42ri$nZ1yrk" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="42ri$nYMPMr" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2fe" resolve="it" />
                                       </node>
                                       <node concept="YBYNd" id="42ri$nZ1zVC" role="2OqNvi" />
                                     </node>
@@ -3427,7 +3427,7 @@
                                     <node concept="2OqwBi" id="42ri$nZ0QMw" role="3uHU7B">
                                       <node concept="2OqwBi" id="42ri$nZ0OWv" role="2Oq$k0">
                                         <node concept="37vLTw" id="42ri$nZ0O_g" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="42ri$nYMPMr" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2fe" resolve="it" />
                                         </node>
                                         <node concept="YBYNd" id="42ri$nZ0Q1v" role="2OqNvi" />
                                       </node>
@@ -3440,7 +3440,7 @@
                                     <node concept="3fqX7Q" id="42ri$nZ0TG3" role="3uHU7w">
                                       <node concept="2OqwBi" id="42ri$nZ0Uxb" role="3fr31v">
                                         <node concept="37vLTw" id="42ri$nZ0U0h" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="42ri$nYMPMr" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2fe" resolve="it" />
                                         </node>
                                         <node concept="1mIQ4w" id="42ri$nZ0V$1" role="2OqNvi">
                                           <node concept="chp4Y" id="42ri$nZ0W3D" role="cj9EA">
@@ -3457,9 +3457,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="42ri$nYMPMr" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2fe" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="42ri$nYMPMs" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2ff" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3587,7 +3587,7 @@
                         <node concept="3clFbF" id="42ri$nYMGf1" role="3cqZAp">
                           <node concept="2OqwBi" id="42ri$nYMGf3" role="3clFbG">
                             <node concept="37vLTw" id="42ri$nYMGf4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="42ri$nYMGf7" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2fg" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="42ri$nYMGf5" role="2OqNvi">
                               <node concept="chp4Y" id="42ri$nYMGf6" role="cj9EA">
@@ -3597,9 +3597,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="42ri$nYMGf7" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2fg" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="42ri$nYMGf8" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2fh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3618,7 +3618,7 @@
                           <node concept="3fqX7Q" id="42ri$nYMDKf" role="3clFbG">
                             <node concept="2OqwBi" id="42ri$nYMDKh" role="3fr31v">
                               <node concept="37vLTw" id="42ri$nYMDKi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="42ri$nYMCdC" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2fi" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="42ri$nYMDKj" role="2OqNvi">
                                 <node concept="chp4Y" id="42ri$nYMDKk" role="cj9EA">
@@ -3629,9 +3629,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="42ri$nYMCdC" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2fi" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="42ri$nYMCdD" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2fj" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4509,7 +4509,7 @@
                     <node concept="3clFbF" id="1TgsdXPeOe9" role="3cqZAp">
                       <node concept="2OqwBi" id="1TgsdXPeQ1l" role="3clFbG">
                         <node concept="37vLTw" id="1TgsdXPePR_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1TgsdXPeO3e" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2fk" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="1TgsdXPeQRk" role="2OqNvi">
                           <node concept="chp4Y" id="1TgsdXPeR3S" role="cj9EA">
@@ -4519,9 +4519,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1TgsdXPeO3e" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fk" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1TgsdXPeO3f" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fl" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4778,7 +4778,7 @@
                     <node concept="3clFbF" id="2ZMK30S2J07" role="3cqZAp">
                       <node concept="2OqwBi" id="2ZMK30S2J8L" role="3clFbG">
                         <node concept="37vLTw" id="2ZMK30S2J06" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2ZMK30S2IOB" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2fm" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="2ZMK30S2JWB" role="2OqNvi">
                           <node concept="chp4Y" id="2ZMK30S2K82" role="cj9EA">
@@ -4788,9 +4788,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2ZMK30S2IOB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fm" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2ZMK30S2IOC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fn" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4956,7 +4956,7 @@
                       <node concept="2OqwBi" id="1TgsdXPgvKb" role="2Oq$k0">
                         <node concept="2OqwBi" id="1TgsdXPgus6" role="2Oq$k0">
                           <node concept="37vLTw" id="1TgsdXPgul0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1TgsdXPguif" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fq" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="1TgsdXPgveh" role="2OqNvi">
                             <ref role="3Tt5mk" to="5wll:73JrkgythEu" resolve="body" />
@@ -4972,7 +4972,7 @@
                             <node concept="3clFbF" id="1TgsdXPg_4F" role="3cqZAp">
                               <node concept="2OqwBi" id="1TgsdXPg_c8" role="3clFbG">
                                 <node concept="37vLTw" id="1TgsdXPg_4E" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1TgsdXPg$Xo" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2fo" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="1TgsdXPg_Vt" role="2OqNvi">
                                   <node concept="chp4Y" id="1TgsdXPgA2S" role="cj9EA">
@@ -4982,18 +4982,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1TgsdXPg$Xo" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2fo" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1TgsdXPg$Xp" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2fp" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1TgsdXPguif" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2fq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1TgsdXPguig" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2fr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5959,7 +5959,7 @@
                               <node concept="2OqwBi" id="1TgsdXP_uDw" role="2Oq$k0">
                                 <node concept="2OqwBi" id="1TgsdXP_tcC" role="2Oq$k0">
                                   <node concept="37vLTw" id="1TgsdXP_t2P" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1TgsdXP_sUF" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2fs" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="1TgsdXP_u6r" role="2OqNvi">
                                     <ref role="3Tt5mk" to="5wll:6bs538lHyXs" resolve="timeout" />
@@ -5973,9 +5973,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1TgsdXP_sUF" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2fs" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1TgsdXP_sUG" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2ft" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6031,7 +6031,7 @@
                       <node concept="3clFbF" id="5usoWIKpMnj" role="3cqZAp">
                         <node concept="2OqwBi" id="5usoWIKpMnk" role="3clFbG">
                           <node concept="37vLTw" id="5usoWIKpMnl" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5usoWIKpMnp" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fu" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="5usoWIKpMnm" role="2OqNvi">
                             <node concept="1xMEDy" id="5usoWIKpMnn" role="1xVPHs">
@@ -6043,9 +6043,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5usoWIKpMnp" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2fu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5usoWIKpMnq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2fv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6065,7 +6065,7 @@
                   <node concept="3clFbF" id="5usoWIKpNpw" role="3cqZAp">
                     <node concept="2OqwBi" id="5usoWIKpNzV" role="3clFbG">
                       <node concept="37vLTw" id="5usoWIKpNpv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5usoWIKpNna" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2fw" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="5usoWIKpOF7" role="2OqNvi">
                         <ref role="37wK5l" to="qd6m:ipMc9Qxfn" resolve="ensureImportFor" />
@@ -6076,9 +6076,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5usoWIKpNna" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2fw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5usoWIKpNnb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2fx" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6114,7 +6114,7 @@
                       <node concept="2OqwBi" id="5usoWIKqhEK" role="33vP2m">
                         <node concept="2OqwBi" id="5usoWIKqhEL" role="2Oq$k0">
                           <node concept="37vLTw" id="5usoWIKqhEM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5usoWIKqbiL" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fy" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5usoWIKqhEN" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -6140,9 +6140,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5usoWIKqbiL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2fy" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5usoWIKqbiM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2fz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6238,7 +6238,7 @@
                           </node>
                           <node concept="2OqwBi" id="1TgsdXPYPVA" role="3uHU7B">
                             <node concept="37vLTw" id="1TgsdXPYPLj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1TgsdXPYPB3" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2f$" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1TgsdXPYQtx" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6247,9 +6247,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1TgsdXPYPB3" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2f$" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1TgsdXPYPB4" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2f_" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8837,7 +8837,7 @@
                         <node concept="2OqwBi" id="42ri$nZ5qra" role="3clFbG">
                           <node concept="2OqwBi" id="42ri$nZ5qrb" role="2Oq$k0">
                             <node concept="37vLTw" id="42ri$nZ5qrc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="42ri$nZ5qrg" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2fA" resolve="it" />
                             </node>
                             <node concept="1mfA1w" id="42ri$nZ5qrd" role="2OqNvi" />
                           </node>
@@ -8849,9 +8849,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="42ri$nZ5qrg" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2fA" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="42ri$nZ5qrh" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2fB" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/runtime.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/runtime.mps
index 39d7beef362..d0dde7a3cda 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/runtime.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/runtime.mps
@@ -12,7 +12,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
     </language>
@@ -31,19 +31,19 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
       <concept id="8463282783691618461" name="com.mbeddr.core.expressions.structure.UnsignedInt8tType" flags="ng" index="26Vqp4" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/util.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/util.mps
index 99f8661bbc9..ec8b0d83158 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/util.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageAccessories/com/mbeddr/ext/concurrency/plainC/util.mps
@@ -109,7 +109,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,7 +123,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -140,6 +140,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -210,7 +211,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -248,7 +249,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -683,14 +683,14 @@
                     <node concept="1rXfSq" id="1TgsdXPQTq_" role="3clFbG">
                       <ref role="37wK5l" node="5gYn0x8dWrt" resolve="requiresOwnSection" />
                       <node concept="37vLTw" id="1TgsdXPQTqA" role="37wK5m">
-                        <ref role="3cqZAo" node="1TgsdXPQTqB" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2eZ" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1TgsdXPQTqB" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2eZ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1TgsdXPQTqC" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2f0" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -738,14 +738,14 @@
                     <node concept="1rXfSq" id="5gYn0x8nUP$" role="3clFbG">
                       <ref role="37wK5l" node="5gYn0x8ej1S" resolve="introduceSections" />
                       <node concept="37vLTw" id="5gYn0x8nUTc" role="37wK5m">
-                        <ref role="3cqZAo" node="5gYn0x8nUMC" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2f1" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5gYn0x8nUMC" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2f1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5gYn0x8nUMD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2f2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1112,7 +1112,7 @@
                     <node concept="22lmx$" id="1TgsdXP8y0m" role="3clFbG">
                       <node concept="2OqwBi" id="1TgsdXP8wys" role="3uHU7w">
                         <node concept="37vLTw" id="1TgsdXP8wqq" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1TgsdXP8wiC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2f3" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="1TgsdXP8xvX" role="2OqNvi">
                           <node concept="chp4Y" id="1TgsdXP8xNv" role="cj9EA">
@@ -1122,7 +1122,7 @@
                       </node>
                       <node concept="2OqwBi" id="1TgsdXP8y8K" role="3uHU7B">
                         <node concept="37vLTw" id="1TgsdXP8y8L" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1TgsdXP8wiC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2f3" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="1TgsdXP8y8M" role="2OqNvi">
                           <node concept="chp4Y" id="1TgsdXP8ygY" role="cj9EA">
@@ -1133,9 +1133,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1TgsdXP8wiC" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2f3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1TgsdXP8wiD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2f4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1528,7 +1528,7 @@
                         <node concept="2OqwBi" id="1TgsdXPpQpd" role="3uHU7w">
                           <node concept="2OqwBi" id="1TgsdXPpPuc" role="2Oq$k0">
                             <node concept="37vLTw" id="1TgsdXPpPlv" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1TgsdXPpM7G" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2f5" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1TgsdXPpPPM" role="2OqNvi">
                               <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
@@ -1544,7 +1544,7 @@
                         </node>
                         <node concept="2OqwBi" id="1TgsdXPpMi1" role="3uHU7B">
                           <node concept="37vLTw" id="1TgsdXPpMc2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1TgsdXPpM7G" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2f5" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="1TgsdXPpP62" role="2OqNvi">
                             <node concept="1xMEDy" id="1TgsdXPpP64" role="1xVPHs">
@@ -1557,9 +1557,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1TgsdXPpM7G" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2f5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1TgsdXPpM7H" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2f6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1639,7 +1639,7 @@
                       </node>
                       <node concept="2OqwBi" id="1TgsdXPq$RF" role="3uHU7B">
                         <node concept="37vLTw" id="1TgsdXPqySQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1TgsdXPqyHC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2f7" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="1TgsdXPq_pt" role="2OqNvi">
                           <ref role="3Tt5mk" to="c4fa:1OcdQnySvSB" resolve="var" />
@@ -1648,9 +1648,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1TgsdXPqyHC" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2f7" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1TgsdXPqyHD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2f8" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1900,14 +1900,14 @@
                           <node concept="3y3z36" id="42ri$nZeDdc" role="3clFbG">
                             <node concept="10Nm6u" id="42ri$nZeDl5" role="3uHU7w" />
                             <node concept="37vLTw" id="42ri$nZeD1a" role="3uHU7B">
-                              <ref role="3cqZAo" node="42ri$nZeC5w" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2f9" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="42ri$nZeC5w" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2f9" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="42ri$nZeC5x" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2fa" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1921,7 +1921,7 @@
                           <node concept="2OqwBi" id="42ri$nZeGU2" role="37wK5m">
                             <node concept="2OqwBi" id="42ri$nZeEra" role="2Oq$k0">
                               <node concept="37vLTw" id="42ri$nZeEfC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="42ri$nZeE2Y" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2fb" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="42ri$nZeF14" role="2OqNvi">
                                 <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
@@ -1932,9 +1932,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="42ri$nZeE2Y" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2fb" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="42ri$nZeE2Z" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2fc" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/behavior.mps
index 318e2a1051c..53f66ff31bd 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/behavior.mps
@@ -65,10 +65,10 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -89,7 +89,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/constraints.mps
index 9957c4fa9f4..9b1f4801800 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/constraints.mps
@@ -37,7 +37,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -63,6 +63,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -98,7 +99,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -106,7 +107,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
     </language>
   </registry>
@@ -187,7 +187,7 @@
                           <node concept="2OqwBi" id="5CkU_dHiqYa" role="3clFbG">
                             <node concept="2OqwBi" id="5CkU_dHiqYb" role="2Oq$k0">
                               <node concept="37vLTw" id="5CkU_dHiqYc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHiqYg" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2eX" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="5CkU_dHiqYd" role="2OqNvi">
                                 <ref role="37wK5l" to="hwgx:6clJcrKmX4x" resolve="externallyReferenceableContentsInChunk" />
@@ -201,9 +201,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHiqYg" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2eX" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHiqYh" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2eY" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/editor.mps
index 7ed4cefbae4..c909e905e9d 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/editor.mps
@@ -42,14 +42,14 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3308396621974588243" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_Contribution" flags="ng" index="3p309x">
@@ -71,7 +71,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -102,7 +102,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -119,7 +119,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/structure.mps
index 6ca5f592b18..7bc55643c91 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/structure.mps
@@ -48,7 +48,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/typesystem.mps
index 27f029c9800..0473363fed7 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/languageModels/typesystem.mps
@@ -34,13 +34,13 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
     </language>
@@ -95,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl
index 84d7794db8e..1aee316a9df 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl
@@ -58,7 +58,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -130,7 +130,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -150,7 +149,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -185,7 +183,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -266,7 +264,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>b879012d-402b-40e0-8df7-e6fa93b9b711(com.mbeddr.ext.concurrency)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/generator/template/main@generator.mps
index eab14f71994..ae5fb2421e8 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/generator/template/main@generator.mps
@@ -275,6 +275,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -551,7 +552,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -757,7 +757,7 @@
                           <node concept="2OqwBi" id="6ndohCVdZlS" role="3clFbG">
                             <node concept="2OqwBi" id="6ndohCVdZlT" role="2Oq$k0">
                               <node concept="37vLTw" id="6ndohCVdZlU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6ndohCVdZm3" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2fD" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="6ndohCVdZlV" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -782,9 +782,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6ndohCVdZm3" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2fD" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6ndohCVdZm4" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2fE" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3167,7 +3167,7 @@
                                   <node concept="3clFbF" id="6bs538mCJ_A" role="3cqZAp">
                                     <node concept="2OqwBi" id="6bs538mCJLH" role="3clFbG">
                                       <node concept="37vLTw" id="6bs538mCJ__" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6bs538mCJvx" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2fF" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="6bs538mCKnh" role="2OqNvi">
                                         <ref role="37wK5l" to="qozy:6bs538mCDK9" resolve="accessedEvents" />
@@ -3175,9 +3175,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6bs538mCJvx" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2fF" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6bs538mCJvy" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2fG" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3252,7 +3252,7 @@
                                   <node concept="3clFbF" id="6bs538mD45b" role="3cqZAp">
                                     <node concept="2OqwBi" id="6bs538mD45c" role="3clFbG">
                                       <node concept="37vLTw" id="6bs538mD45d" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6bs538mD45f" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2fH" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="6bs538mD4JG" role="2OqNvi">
                                         <ref role="37wK5l" to="qozy:6zcb4tIDdsk" resolve="accessedSharedVariables" />
@@ -3260,9 +3260,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6bs538mD45f" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2fH" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6bs538mD45g" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2fI" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -5680,7 +5680,7 @@
                           <node concept="2OqwBi" id="7hczD5g1CRs" role="3clFbG">
                             <node concept="2OqwBi" id="7hczD5g1CRt" role="2Oq$k0">
                               <node concept="37vLTw" id="7hczD5g1CRu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7hczD5g1CR$" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2fJ" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7hczD5g1CRv" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5700,9 +5700,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7hczD5g1CR$" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2fJ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7hczD5g1CR_" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2fK" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5837,7 +5837,7 @@
                     <node concept="3clFbF" id="7hczD5g1NFD" role="3cqZAp">
                       <node concept="2OqwBi" id="7hczD5g1NFE" role="3clFbG">
                         <node concept="37vLTw" id="7hczD5g1NFF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7hczD5g1NFJ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2fL" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="7hczD5g1NFG" role="2OqNvi">
                           <node concept="1xMEDy" id="7hczD5g1NFH" role="1xVPHs">
@@ -5849,9 +5849,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7hczD5g1NFJ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fL" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7hczD5g1NFK" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fM" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageAccessories/com/mbeddr/ext/concurrency/pthreads/util.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageAccessories/com/mbeddr/ext/concurrency/pthreads/util.mps
index e5ae6c763a7..21ab17b161b 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageAccessories/com/mbeddr/ext/concurrency/pthreads/util.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageAccessories/com/mbeddr/ext/concurrency/pthreads/util.mps
@@ -26,7 +26,7 @@
         <property id="3108382027639948845" name="requiredStdHeader" index="s$Nrh" />
         <child id="3108382027639948855" name="arguments" index="s$Nrb" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -104,13 +104,13 @@
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ng" index="k8FjF">
+      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ngI" index="k8FjF">
         <child id="883533952987441014" name="kind" index="3U$Ho4" />
       </concept>
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -118,7 +118,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -147,7 +147,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -170,7 +170,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/behavior.mps
index 65b1fc945b3..f76b3fb958c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/behavior.mps
@@ -85,7 +85,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,7 +97,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -139,7 +139,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/structure.mps
index b638aa92205..06e1b53e4a1 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/languageModels/structure.mps
@@ -25,7 +25,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl
index 49ef63ecbfb..2a3265eed7f 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl
@@ -40,7 +40,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -101,12 +101,10 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
@@ -123,7 +121,7 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -205,7 +203,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/generator/template/main@generator.mps
index 9e19266183c..029f961098b 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/generator/template/main@generator.mps
@@ -20,7 +20,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/behavior.mps
index 38c3011a3e7..9da5158e593 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/behavior.mps
@@ -103,7 +103,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,7 +112,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -124,6 +124,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -225,7 +226,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -247,7 +248,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -561,7 +561,7 @@
                     <node concept="3clFbF" id="6zcb4tIDARB" role="3cqZAp">
                       <node concept="2OqwBi" id="6zcb4tIDARC" role="3clFbG">
                         <node concept="37vLTw" id="6zcb4tIDARD" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6zcb4tIDARF" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2fN" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6zcb4tIDARE" role="2OqNvi">
                           <ref role="37wK5l" node="4mSSgpjqg3A" resolve="queue" />
@@ -569,9 +569,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6zcb4tIDARF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fN" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6zcb4tIDARG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fO" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -610,7 +610,7 @@
                       <node concept="3clFbF" id="6zcb4tIDxql" role="3cqZAp">
                         <node concept="2OqwBi" id="6zcb4tIDxts" role="3clFbG">
                           <node concept="37vLTw" id="6zcb4tIDxqk" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6zcb4tIDxnY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fP" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6zcb4tIDCm7" role="2OqNvi">
                             <ref role="3Tt5mk" to="x27k:5IYyAOzCwFF" resolve="var" />
@@ -618,9 +618,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6zcb4tIDxnY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2fP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6zcb4tIDxnZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2fQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -632,7 +632,7 @@
                       <node concept="2OqwBi" id="6zcb4tIDG4o" role="3clFbG">
                         <node concept="2OqwBi" id="6zcb4tIDEuG" role="2Oq$k0">
                           <node concept="37vLTw" id="6zcb4tIDEfE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6zcb4tIDE9p" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fR" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="6zcb4tIDFyK" role="2OqNvi">
                             <node concept="3CFYIy" id="6zcb4tIDFQV" role="3CFYIz">
@@ -644,9 +644,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6zcb4tIDE9p" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fR" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6zcb4tIDE9q" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fS" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -811,7 +811,7 @@
                         </node>
                         <node concept="2OqwBi" id="66UaKxBzkaL" role="3uHU7B">
                           <node concept="37vLTw" id="66UaKxBzkaM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="66UaKxBzkaO" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fT" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="66UaKxBzkaN" role="2OqNvi">
                             <ref role="3Tt5mk" to="5wll:vg5qBCe_Pa" resolve="var" />
@@ -820,9 +820,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="66UaKxBzkaO" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fT" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="66UaKxBzkaP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fU" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -876,7 +876,7 @@
                         </node>
                         <node concept="2OqwBi" id="6u_410TQpnd" role="3uHU7B">
                           <node concept="37vLTw" id="6u_410TQpne" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6u_410TQpng" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fV" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6u_410TQqo_" role="2OqNvi">
                             <ref role="3Tt5mk" to="5wll:6u_410TvjqC" resolve="res" />
@@ -885,9 +885,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6u_410TQpng" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6u_410TQpnh" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -938,7 +938,7 @@
                         </node>
                         <node concept="2OqwBi" id="66UaKxBzkWG" role="3uHU7B">
                           <node concept="37vLTw" id="66UaKxBzkWH" role="2Oq$k0">
-                            <ref role="3cqZAo" node="66UaKxBzkWJ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2fX" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="66UaKxBzkWI" role="2OqNvi">
                             <ref role="3Tt5mk" to="5wll:vg5qBCe_Pa" resolve="var" />
@@ -947,9 +947,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="66UaKxBzkWJ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2fX" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="66UaKxBzkWK" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2fY" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1008,7 +1008,7 @@
                   <node concept="3clFbF" id="6ndohCVbe0T" role="3cqZAp">
                     <node concept="2OqwBi" id="6u_410TC1U5" role="3clFbG">
                       <node concept="37vLTw" id="6u_410TC1QR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6ndohCVbdXX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2fZ" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6u_410TC25n" role="2OqNvi">
                         <ref role="37wK5l" node="6u_410TBOiy" resolve="sortName" />
@@ -1016,9 +1016,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6ndohCVbdXX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2fZ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6ndohCVbdXY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2g0" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="6ndohCVbdXZ" role="2S7zOq">
@@ -1052,7 +1052,7 @@
                   <node concept="3clFbF" id="6ndohCVbftV" role="3cqZAp">
                     <node concept="2OqwBi" id="6u_410TC2d9" role="3clFbG">
                       <node concept="37vLTw" id="6u_410TC29V" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6ndohCVbfu1" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2g1" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6u_410TC2nl" role="2OqNvi">
                         <ref role="37wK5l" node="6u_410TBOiy" resolve="sortName" />
@@ -1060,9 +1060,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6ndohCVbfu1" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2g1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6ndohCVbfu2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2g2" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="6ndohCVbfTN" role="2S7zOq">
@@ -1289,7 +1289,7 @@
                   <node concept="3clFbF" id="2ajpxDX4S6t" role="3cqZAp">
                     <node concept="2OqwBi" id="2ajpxDX4S9Z" role="3clFbG">
                       <node concept="37vLTw" id="2ajpxDX4S6s" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2ajpxDX4S3X" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2g3" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="2ajpxDX4Snj" role="2OqNvi">
                         <ref role="37wK5l" node="2ajpxDX4K0q" resolve="task" />
@@ -1297,9 +1297,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ajpxDX4S3X" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2g3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ajpxDX4S3Y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2g4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2349,7 +2349,7 @@
                       </node>
                       <node concept="2OqwBi" id="6u_410TQEaT" role="3uHU7B">
                         <node concept="37vLTw" id="6u_410TQE7x" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6u_410TQE4V" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2g5" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6u_410TQEn3" role="2OqNvi">
                           <ref role="3Tt5mk" to="5wll:6u_410TvjqC" resolve="res" />
@@ -2358,9 +2358,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6u_410TQE4V" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2g5" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6u_410TQE4W" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2g6" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/constraints.mps
index a5db52ff802..e5ca19b1bcf 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/constraints.mps
@@ -69,7 +69,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,6 +97,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -152,7 +153,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -163,7 +164,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -727,7 +727,7 @@
                       <node concept="3clFbF" id="5CkU_dHir$o" role="3cqZAp">
                         <node concept="2OqwBi" id="5CkU_dHir$p" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHir$q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5CkU_dHir$u" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2g7" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="5CkU_dHir$r" role="2OqNvi">
                             <node concept="1xMEDy" id="5CkU_dHir$s" role="1xVPHs">
@@ -739,9 +739,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHir$u" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2g7" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHir$v" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2g8" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/editor.mps
index d2d4cf83678..22992d88e79 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/editor.mps
@@ -78,7 +78,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -97,7 +97,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -149,7 +149,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -210,7 +210,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/intentions.mps
index df4da61c4c2..f511f85e968 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/intentions.mps
@@ -57,7 +57,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -156,7 +156,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps
index 335afe81ccb..a6fb52b325a 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps
@@ -85,7 +85,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/typesystem.mps
index e5e6e02101c..dbe5363a57c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/typesystem.mps
@@ -73,7 +73,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -89,6 +89,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -209,7 +210,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -239,7 +240,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -378,7 +378,7 @@
                       </node>
                       <node concept="2OqwBi" id="66UaKxBx$2D" role="3uHU7B">
                         <node concept="37vLTw" id="66UaKxBx$2E" role="2Oq$k0">
-                          <ref role="3cqZAo" node="66UaKxBx$2G" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2g9" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="66UaKxBx$2F" role="2OqNvi">
                           <ref role="3Tt5mk" to="5wll:vg5qBCe_Pa" resolve="var" />
@@ -387,9 +387,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="66UaKxBx$2G" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2g9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="66UaKxBx$2H" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ga" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1453,7 +1453,7 @@
                   <node concept="3clFbF" id="tTL6IVWUQp" role="3cqZAp">
                     <node concept="2OqwBi" id="tTL6IVWUQq" role="3clFbG">
                       <node concept="37vLTw" id="tTL6IVWUQr" role="2Oq$k0">
-                        <ref role="3cqZAo" node="tTL6IVWUQt" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2gb" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="tTL6IVWUQs" role="2OqNvi">
                         <ref role="37wK5l" to="qozy:4hMIGYxhy4M" resolve="taskDeclarations" />
@@ -1461,9 +1461,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="tTL6IVWUQt" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2gb" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="tTL6IVWUQu" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2gc" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1530,7 +1530,7 @@
                             </node>
                             <node concept="2OqwBi" id="tTL6IVWVE0" role="3uHU7B">
                               <node concept="37vLTw" id="tTL6IVWV$H" role="2Oq$k0">
-                                <ref role="3cqZAo" node="tTL6IVWVwH" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2gd" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="tTL6IVWVY$" role="2OqNvi">
                                 <ref role="37wK5l" to="qozy:2ajpxDX4K0q" resolve="task" />
@@ -1539,9 +1539,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="tTL6IVWVwH" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2gd" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="tTL6IVWVwI" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2ge" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1584,7 +1584,7 @@
                   <node concept="3clFbF" id="73GSrjd_$ai" role="3cqZAp">
                     <node concept="2OqwBi" id="73GSrjd_$aj" role="3clFbG">
                       <node concept="37vLTw" id="73GSrjd_$ak" role="2Oq$k0">
-                        <ref role="3cqZAo" node="73GSrjd_$an" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2gf" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="73GSrjd_$al" role="2OqNvi">
                         <node concept="chp4Y" id="73GSrjd_$am" role="cj9EA">
@@ -1594,9 +1594,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="73GSrjd_$an" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2gf" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="73GSrjd_$ao" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2gg" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl
index f06d635bc7c..e307709ece2 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl
@@ -44,7 +44,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -102,7 +102,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0fcee1cf-8f59-441b-b9c7-7ff7bdd6bc97(de.itemis.mps.editor.math.symbols)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -126,7 +125,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -154,7 +153,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/generator/template/main@generator.mps
index 61fab06ed7a..f9b3bbce73f 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/generator/template/main@generator.mps
@@ -46,7 +46,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -182,7 +182,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -199,7 +199,7 @@
       <concept id="5763383285156373022" name="com.mbeddr.core.expressions.structure.DivExpression" flags="ng" index="2BOcih" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717642" name="com.mbeddr.core.expressions.structure.OrExpression" flags="ng" index="2EHzL4" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/actions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/actions.mps
index 8cf28a2b783..f64ad322186 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/actions.mps
@@ -46,7 +46,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/behavior.mps
index 5f1b1fc1f0c..587fe922cf7 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/behavior.mps
@@ -81,7 +81,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -92,7 +92,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/constraints.mps
index e80c505f511..ddc6916eddc 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/constraints.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -68,6 +68,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -97,7 +98,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -108,7 +109,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -182,7 +182,7 @@
                           <node concept="3clFbF" id="5CkU_dHis0r" role="3cqZAp">
                             <node concept="2OqwBi" id="5CkU_dHis0s" role="3clFbG">
                               <node concept="37vLTw" id="5CkU_dHis0t" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHis0w" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2gi" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="5CkU_dHis0u" role="2OqNvi">
                                 <node concept="chp4Y" id="5CkU_dHis0v" role="cj9EA">
@@ -192,9 +192,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHis0w" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2gi" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHis0x" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2gj" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -205,7 +205,7 @@
                         <node concept="3clFbF" id="5CkU_dHis0_" role="3cqZAp">
                           <node concept="1PxgMI" id="5CkU_dHis0A" role="3clFbG">
                             <node concept="37vLTw" id="5CkU_dHis0B" role="1m5AlR">
-                              <ref role="3cqZAo" node="5CkU_dHis0D" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2gk" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="5CkU_dHis0C" role="3oSUPX">
                               <ref role="cht4Q" to="cetu:4r1mNB_fOp9" resolve="MathLoopExpression" />
@@ -213,9 +213,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5CkU_dHis0D" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2gk" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5CkU_dHis0E" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2gl" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/editor.mps
index 17a0b5d3c57..c25a1e17411 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/editor.mps
@@ -72,15 +72,15 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1838685759388685703" name="jetbrains.mps.lang.editor.structure.TransformationFeature_DescriptionText" flags="ng" index="3cqGtN">
@@ -94,7 +94,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -111,11 +111,11 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -127,7 +127,7 @@
         <child id="4233361609415241000" name="parameterQuery" index="1GhOrs" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -229,7 +229,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -241,7 +241,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -260,6 +260,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -357,7 +358,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -379,7 +380,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -1182,7 +1182,7 @@
                             <node concept="3fqX7Q" id="1eTp1AxLPF8" role="3clFbG">
                               <node concept="2OqwBi" id="1eTp1AxLPF9" role="3fr31v">
                                 <node concept="37vLTw" id="1eTp1AxLPFa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1eTp1AxLPFc" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2gm" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="1eTp1AxLPFb" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1191,9 +1191,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1eTp1AxLPFc" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2gm" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1eTp1AxLPFd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2gn" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1211,7 +1211,7 @@
                             </node>
                             <node concept="2OqwBi" id="1eTp1AxLPFl" role="3uHU7B">
                               <node concept="37vLTw" id="1eTp1AxLPFm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1eTp1AxLPFo" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2go" resolve="it" />
                               </node>
                               <node concept="liA8E" id="1eTp1AxLPFn" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
@@ -1220,9 +1220,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1eTp1AxLPFo" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2go" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1eTp1AxLPFp" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2gp" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/intentions.mps
index f320c2372c9..f10b9f0214c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/intentions.mps
@@ -93,7 +93,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/plugin.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/plugin.mps
index 96f406982e0..46939ddbce5 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/plugin.mps
@@ -2,12 +2,12 @@
 <model ref="r:3bf31f06-8688-4afb-86f9-058f442c0f79(com.mbeddr.ext.math.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="677f00fb-4488-405e-9885-abb75d472fd1" name="com.mbeddr.mpsutil.contextactions" version="0" />
     <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="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/structure.mps
index 64d0239a691..c59f28086f9 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/structure.mps
@@ -48,7 +48,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/typesystem.mps
index c8e9428be79..74aa77bb556 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/languageModels/typesystem.mps
@@ -52,7 +52,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -138,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl
index 51fe07bdf9f..7a82d6209bd 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl
@@ -66,7 +66,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -137,7 +137,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="before_or_together">
@@ -164,7 +163,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -203,7 +201,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -282,7 +280,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/generator/template/main@generator.mps
index 4b485457112..2769c77e205 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/generator/template/main@generator.mps
@@ -85,7 +85,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -247,6 +247,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -315,7 +316,7 @@
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -323,7 +324,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -408,7 +409,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -426,7 +427,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
@@ -459,7 +460,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -2371,7 +2371,7 @@
                             <node concept="1eOMI4" id="5whq9PPUjk0" role="2Oq$k0">
                               <node concept="10QFUN" id="5whq9PPUjk1" role="1eOMHV">
                                 <node concept="37vLTw" id="5whq9PPUjjZ" role="10QFUP">
-                                  <ref role="3cqZAo" node="6JJhAyRm_z5" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2gB" resolve="it" />
                                 </node>
                                 <node concept="3Tqbb2" id="5whq9PPUzif" role="10QFUM" />
                               </node>
@@ -2384,9 +2384,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6JJhAyRm_z5" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gB" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6JJhAyRm_z6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gC" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2433,7 +2433,7 @@
                       <node concept="3clFbF" id="6JJhAyRmEbG" role="3cqZAp">
                         <node concept="2OqwBi" id="6JJhAyRmEm3" role="3clFbG">
                           <node concept="37vLTw" id="6JJhAyRmEbF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6JJhAyRmEat" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2gD" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6JJhAyRmHI9" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -2444,9 +2444,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6JJhAyRmEat" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gD" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6JJhAyRmEau" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2475,7 +2475,7 @@
                         <node concept="2OqwBi" id="6JJhAyRnn1c" role="3clFbG">
                           <node concept="2OqwBi" id="6JJhAyRnn1d" role="2Oq$k0">
                             <node concept="37vLTw" id="6JJhAyRnn1e" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6JJhAyRnn1m" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2gF" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6JJhAyRnn1f" role="2OqNvi">
                               <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -2499,9 +2499,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6JJhAyRnn1m" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gF" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6JJhAyRnn1n" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gG" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2547,7 +2547,7 @@
                             <node concept="1PxgMI" id="6JJhAyRn2xP" role="3clFbG">
                               <node concept="2OqwBi" id="6JJhAyRn2xQ" role="1m5AlR">
                                 <node concept="37vLTw" id="6JJhAyRn2xR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6JJhAyRn2xT" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2gH" resolve="it" />
                                 </node>
                                 <node concept="2Rxl7S" id="6JJhAyRn2xS" role="2OqNvi" />
                               </node>
@@ -2557,9 +2557,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6JJhAyRn2xT" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2gH" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6JJhAyRn2xU" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2gI" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2608,7 +2608,7 @@
                       <node concept="3clFbF" id="6JJhAyRn3jO" role="3cqZAp">
                         <node concept="2OqwBi" id="6JJhAyRn3jP" role="3clFbG">
                           <node concept="37vLTw" id="6JJhAyRn3jQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6JJhAyRn3jT" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2gJ" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6JJhAyRn3jR" role="2OqNvi">
                             <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -2619,9 +2619,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6JJhAyRn3jT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6JJhAyRn3jU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2650,7 +2650,7 @@
                         <node concept="2OqwBi" id="6JJhAyRnigW" role="3clFbG">
                           <node concept="2OqwBi" id="6JJhAyRngxQ" role="2Oq$k0">
                             <node concept="37vLTw" id="6JJhAyRngtz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6JJhAyRngsk" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2gL" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6JJhAyRnhmD" role="2OqNvi">
                               <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -2674,9 +2674,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6JJhAyRngsk" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6JJhAyRngsl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageAccessories/com/mbeddr/ext/messaging/crc.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageAccessories/com/mbeddr/ext/messaging/crc.mps
index 290a29e33c3..bf9cfd36a33 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageAccessories/com/mbeddr/ext/messaging/crc.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageAccessories/com/mbeddr/ext/messaging/crc.mps
@@ -16,7 +16,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -103,14 +103,14 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -139,7 +139,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -156,7 +156,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/behavior.mps
index 25609554cd0..8b9547d28af 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/behavior.mps
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -107,13 +107,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -152,7 +153,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -168,7 +169,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
     </language>
@@ -364,7 +364,7 @@
                       <node concept="3clFbF" id="F16UoWz633" role="3cqZAp">
                         <node concept="2OqwBi" id="F16UoWz634" role="3clFbG">
                           <node concept="37vLTw" id="F16UoWz635" role="2Oq$k0">
-                            <ref role="3cqZAo" node="F16UoWz5Ru" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2gq" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="F16UoWz636" role="2OqNvi">
                             <node concept="chp4Y" id="2hvQkqcPmmZ" role="cj9EA">
@@ -374,9 +374,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="F16UoWz5Ru" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gq" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="F16UoWz5Rv" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gr" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -392,7 +392,7 @@
                     <node concept="3clFbF" id="F16UoWyVOZ" role="3cqZAp">
                       <node concept="2OqwBi" id="F16UoWyVP0" role="3clFbG">
                         <node concept="37vLTw" id="F16UoWyVP1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="F16UoWyVLy" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2gs" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="F16UoWyVP2" role="2OqNvi">
                           <node concept="chp4Y" id="2hvQkqcPm5V" role="cj9EA">
@@ -402,9 +402,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="F16UoWyVLy" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2gs" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="F16UoWyVLz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2gt" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -453,7 +453,7 @@
                       <node concept="3clFbF" id="6IWRcVOLkXe" role="3cqZAp">
                         <node concept="2OqwBi" id="6IWRcVOLkXf" role="3clFbG">
                           <node concept="37vLTw" id="6IWRcVOLkXg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6IWRcVOLkXj" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2gu" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="6IWRcVOLkXh" role="2OqNvi">
                             <node concept="chp4Y" id="2hvQkqcPms0" role="cj9EA">
@@ -463,9 +463,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6IWRcVOLkXj" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6IWRcVOLkXk" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -561,11 +561,11 @@
                                   <node concept="3clFbF" id="5aZFu$7GKMT" role="3cqZAp">
                                     <node concept="3clFbC" id="5aZFu$7GKMU" role="3clFbG">
                                       <node concept="37vLTw" id="5aZFu$7GKMV" role="3uHU7w">
-                                        <ref role="3cqZAo" node="5aZFu$7GKN1" resolve="m" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2gy" resolve="m" />
                                       </node>
                                       <node concept="2OqwBi" id="5aZFu$7GKMW" role="3uHU7B">
                                         <node concept="37vLTw" id="5aZFu$7GKMX" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5aZFu$7GKMZ" resolve="a" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2gw" resolve="a" />
                                         </node>
                                         <node concept="3TrEf2" id="2hvQkqcPu72" role="2OqNvi">
                                           <ref role="3Tt5mk" to="vuss:2hvQkqcPt92" resolve="member" />
@@ -574,18 +574,18 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5aZFu$7GKMZ" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2gw" role="1bW2Oz">
                                   <property role="TrG5h" value="a" />
-                                  <node concept="2jxLKc" id="5aZFu$7GKN0" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2gx" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5aZFu$7GKN1" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2gy" role="1bW2Oz">
                         <property role="TrG5h" value="m" />
-                        <node concept="2jxLKc" id="5aZFu$7GKN2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2gz" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -603,7 +603,7 @@
                   <node concept="3clFbF" id="5aZFu$7G_RZ" role="3cqZAp">
                     <node concept="2OqwBi" id="5aZFu$7G_S0" role="3clFbG">
                       <node concept="37vLTw" id="5aZFu$7G_S1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5aZFu$7G_S4" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2g$" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5aZFu$7G_S2" role="2OqNvi">
                         <node concept="chp4Y" id="2hvQkqcPoV9" role="cj9EA">
@@ -613,9 +613,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5aZFu$7G_S4" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2g$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5aZFu$7G_S5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2g_" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/constraints.mps
index d68228ce0e1..696a617d5cb 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/constraints.mps
@@ -67,7 +67,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -159,7 +159,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/dataFlow.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/dataFlow.mps
index 8bee96a2666..d4358cdb8b6 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/dataFlow.mps
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/editor.mps
index 8bbd96b1cf4..cb29bc8894b 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/editor.mps
@@ -20,7 +20,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -39,7 +39,7 @@
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="8478191136883534207" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_Selection" flags="ng" index="upBMk">
@@ -72,10 +72,10 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -87,7 +87,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -111,7 +111,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -169,7 +169,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -201,7 +201,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/structure.mps
index abb2fa278c0..d456f648b6e 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/structure.mps
@@ -38,7 +38,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/typesystem.mps
index 6355f0243fa..5551af0387e 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/languageModels/typesystem.mps
@@ -61,7 +61,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -161,7 +161,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl
index 827df6c6e48..7621cb43ea4 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl
@@ -66,7 +66,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -138,7 +138,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -175,7 +174,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)</dependency>
     <dependency reexport="false">3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)</dependency>
@@ -217,7 +215,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -298,7 +296,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/com/mbeddr/ext/serialization/generator/com/mbeddr/ext/serialization/util.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/com/mbeddr/ext/serialization/generator/com/mbeddr/ext/serialization/util.mps
index 4e3b7ae2994..934521b5527 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/com/mbeddr/ext/serialization/generator/com/mbeddr/ext/serialization/util.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/com/mbeddr/ext/serialization/generator/com/mbeddr/ext/serialization/util.mps
@@ -96,7 +96,7 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,7 +112,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -203,7 +203,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/main@generator.mps
index 83db47de839..0574eddb2ff 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/generator/template/main@generator.mps
@@ -97,7 +97,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,7 +112,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -192,6 +192,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -242,7 +243,7 @@
         <child id="8551646674110395549" name="argTypes" index="pFrBa" />
         <child id="8551646674110395548" name="returnType" index="pFrBb" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -250,7 +251,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -347,7 +348,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -365,7 +366,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
@@ -398,7 +399,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -4789,7 +4789,7 @@
                       <node concept="3clFbF" id="5usoWIKpMnj" role="3cqZAp">
                         <node concept="2OqwBi" id="5usoWIKpMnk" role="3clFbG">
                           <node concept="37vLTw" id="5usoWIKpMnl" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5usoWIKpMnp" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2gS" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="5usoWIKpMnm" role="2OqNvi">
                             <node concept="1xMEDy" id="5usoWIKpMnn" role="1xVPHs">
@@ -4801,9 +4801,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5usoWIKpMnp" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2gS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5usoWIKpMnq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2gT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4823,7 +4823,7 @@
                   <node concept="3clFbF" id="5usoWIKpNpw" role="3cqZAp">
                     <node concept="2OqwBi" id="5usoWIKpNzV" role="3clFbG">
                       <node concept="37vLTw" id="5usoWIKpNpv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5usoWIKpNna" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2gU" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="5usoWIKpOF7" role="2OqNvi">
                         <ref role="37wK5l" to="qd6m:ipMc9Qxfn" resolve="ensureImportFor" />
@@ -4834,9 +4834,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5usoWIKpNna" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2gU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5usoWIKpNnb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2gV" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4872,7 +4872,7 @@
                       <node concept="2OqwBi" id="5usoWIKqhEK" role="33vP2m">
                         <node concept="2OqwBi" id="5usoWIKqhEL" role="2Oq$k0">
                           <node concept="37vLTw" id="5usoWIKqhEM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5usoWIKqbiL" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2gW" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5usoWIKqhEN" role="2OqNvi">
                             <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
@@ -4898,9 +4898,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5usoWIKqbiL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2gW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5usoWIKqbiM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2gX" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4968,7 +4968,7 @@
                         <node concept="1PxgMI" id="7op4RkOGI1O" role="2Oq$k0">
                           <node concept="2OqwBi" id="7op4RkOGHpk" role="1m5AlR">
                             <node concept="37vLTw" id="7op4RkOGHlS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7op4RkOGHj$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2gY" resolve="it" />
                             </node>
                             <node concept="1mfA1w" id="7op4RkOGHNb" role="2OqNvi" />
                           </node>
@@ -4982,9 +4982,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7op4RkOGHj$" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2gY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7op4RkOGHj_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2gZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4997,7 +4997,7 @@
                       <node concept="2OqwBi" id="7op4RkOGL9u" role="3fr31v">
                         <node concept="2OqwBi" id="7op4RkOGL9v" role="2Oq$k0">
                           <node concept="37vLTw" id="7op4RkOGL9w" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7op4RkOGIMk" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2h0" resolve="it" />
                           </node>
                           <node concept="3JvlWi" id="7op4RkOGL9x" role="2OqNvi" />
                         </node>
@@ -5010,9 +5010,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7op4RkOGIMk" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2h0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7op4RkOGIMl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2h1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5036,7 +5036,7 @@
                     <node concept="2OqwBi" id="1LleiTPPGHx" role="3clFbG">
                       <node concept="2OqwBi" id="7op4RkOLE3p" role="2Oq$k0">
                         <node concept="37vLTw" id="1LleiTPPGBX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1LleiTPPGA9" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2h2" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="7op4RkOLEx5" role="2OqNvi">
                           <node concept="1xMEDy" id="7op4RkOLEx7" role="1xVPHs">
@@ -5051,16 +5051,16 @@
                           <ref role="37wK5l" to="ogpu:1LleiTPICCN" resolve="convertWrite" />
                           <ref role="1Pybhc" to="ogpu:1LleiTPICBN" resolve="ReadWriteConverter" />
                           <node concept="37vLTw" id="1LleiTPPI8e" role="37wK5m">
-                            <ref role="3cqZAo" node="1LleiTPPGA9" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2h2" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1LleiTPPGA9" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2h2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1LleiTPPGAa" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2h3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5083,7 +5083,7 @@
                     <node concept="2OqwBi" id="7op4RkOVyr9" role="3clFbG">
                       <node concept="2OqwBi" id="7op4RkOVyra" role="2Oq$k0">
                         <node concept="37vLTw" id="7op4RkOVyrb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7op4RkOVyri" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2h4" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="7op4RkOVyrc" role="2OqNvi">
                           <node concept="1xMEDy" id="7op4RkOVyrd" role="1xVPHs">
@@ -5098,16 +5098,16 @@
                           <ref role="37wK5l" to="ogpu:7op4RkOV$5u" resolve="convertRead" />
                           <ref role="1Pybhc" to="ogpu:1LleiTPICBN" resolve="ReadWriteConverter" />
                           <node concept="37vLTw" id="6pWLWdosD5q" role="37wK5m">
-                            <ref role="3cqZAo" node="7op4RkOVyri" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2h4" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7op4RkOVyri" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2h4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7op4RkOVyrj" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2h5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5138,7 +5138,7 @@
                       <node concept="2OqwBi" id="6OFMQWRw1NY" role="3clFbG">
                         <node concept="2OqwBi" id="6OFMQWRw1NZ" role="2Oq$k0">
                           <node concept="37vLTw" id="6OFMQWRw1O0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6OFMQWRw1O4" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2h6" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6OFMQWRw1O1" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5158,9 +5158,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6OFMQWRw1O4" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2h6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6OFMQWRw1O5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2h7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5219,7 +5219,7 @@
                       <node concept="3clFbF" id="6OFMQWRw54a" role="3cqZAp">
                         <node concept="2OqwBi" id="6OFMQWRw54b" role="3clFbG">
                           <node concept="37vLTw" id="6OFMQWRw54c" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6OFMQWRw54g" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2h8" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="6OFMQWRw54d" role="2OqNvi">
                             <node concept="1xMEDy" id="6OFMQWRw54e" role="1xVPHs">
@@ -5231,9 +5231,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6OFMQWRw54g" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2h8" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6OFMQWRw54h" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2h9" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5246,7 +5246,7 @@
                   <node concept="3clFbF" id="1LleiTPTWW7" role="3cqZAp">
                     <node concept="2OqwBi" id="1LleiTPTWW8" role="3clFbG">
                       <node concept="37vLTw" id="1LleiTPTWW9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1LleiTPTWWd" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ha" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="1LleiTPUhGb" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:4ryX3g5gs5R" resolve="ensureDefaultImportFor" />
@@ -5257,9 +5257,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1LleiTPTWWd" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ha" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1LleiTPTWWe" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hb" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageAccessories/com/mbeddr/ext/serialization/cmp.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageAccessories/com/mbeddr/ext/serialization/cmp.mps
index 6f4c5b9ab71..7dab299e295 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageAccessories/com/mbeddr/ext/serialization/cmp.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageAccessories/com/mbeddr/ext/serialization/cmp.mps
@@ -29,7 +29,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -126,7 +126,7 @@
       <concept id="6512473996287153137" name="com.mbeddr.core.modules.structure.Section" flags="ng" index="fMItD">
         <child id="6512473996287153139" name="contents" index="fMItF" />
       </concept>
-      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ng" index="k8FjF">
+      <concept id="8444296659257696249" name="com.mbeddr.core.modules.structure.IArgumentLike" flags="ngI" index="k8FjF">
         <child id="883533952987441014" name="kind" index="3U$Ho4" />
       </concept>
       <concept id="8551646674110505761" name="com.mbeddr.core.modules.structure.FunctionRefCallExpr" flags="ng" index="pF6TQ">
@@ -152,17 +152,17 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -195,7 +195,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -223,7 +223,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/behavior.mps
index 51e6a0646e7..ec350af9e60 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/behavior.mps
@@ -99,14 +99,14 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -187,7 +187,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/constraints.mps
index ac646a5e9fc..ff65d40a617 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/constraints.mps
@@ -79,7 +79,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -177,7 +177,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/dataFlow.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/dataFlow.mps
index 5fd53d0035d..ac739a4d46d 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/dataFlow.mps
@@ -85,7 +85,7 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/editor.mps
index ea9cc468c67..09e006bb34b 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/editor.mps
@@ -22,7 +22,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -40,7 +40,7 @@
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="8478191136883534207" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_Selection" flags="ng" index="upBMk">
@@ -72,10 +72,10 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -97,7 +97,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -123,7 +123,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -194,7 +194,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -241,7 +241,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/intentions.mps
index 08ac93e6a1f..fd779a0d514 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/intentions.mps
@@ -68,7 +68,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/structure.mps
index ae7e47c1d47..4fb43b7b362 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/structure.mps
@@ -50,7 +50,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/typesystem.mps
index f0a53bf80bb..5a79b5f1adc 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/languageModels/typesystem.mps
@@ -92,7 +92,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -108,7 +108,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -118,6 +118,7 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -241,7 +242,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -258,7 +259,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
@@ -439,7 +439,7 @@
                             <node concept="3clFbF" id="3XvCV0KxIll" role="3cqZAp">
                               <node concept="2OqwBi" id="3XvCV0KxIzS" role="3clFbG">
                                 <node concept="37vLTw" id="3XvCV0KxIlk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3XvCV0KxI3d" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2gN" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3XvCV0KxNrV" role="2OqNvi">
                                   <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
@@ -447,9 +447,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3XvCV0KxI3d" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2gN" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3XvCV0KxI3e" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2gO" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -461,14 +461,14 @@
                             <node concept="1rXfSq" id="3XvCV0KxMmR" role="3clFbG">
                               <ref role="37wK5l" node="3XvCV0KwND0" resolve="isTypeAllowed" />
                               <node concept="37vLTw" id="3XvCV0KxMCK" role="37wK5m">
-                                <ref role="3cqZAo" node="3XvCV0KxM3e" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2gP" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3XvCV0KxM3e" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2gP" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3XvCV0KxM3f" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2gQ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/generator/template/main@generator.mps
index 8da17c39980..b91a3e7747c 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/generator/template/main@generator.mps
@@ -126,7 +126,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -170,7 +170,7 @@
         <child id="3134547887598524959" name="cases" index="ggJMH" />
         <child id="3134547887598524925" name="expression" index="ggJXf" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -253,7 +253,7 @@
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
@@ -269,7 +269,7 @@
         <child id="1169570368028" name="ruleConsequence" index="1fOSGc" />
         <child id="1184616230853" name="contextNodeQuery" index="3gCiVm" />
       </concept>
-      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ng" index="30XT8A">
+      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ngI" index="30XT8A">
         <property id="3265704088513289864" name="comment" index="34cw8o" />
       </concept>
       <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
@@ -310,7 +310,7 @@
       <concept id="1195502151594" name="jetbrains.mps.lang.generator.structure.MappingScriptReference" flags="lg" index="1puMqW">
         <reference id="1195502167610" name="mappingScript" index="1puQsG" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ngI" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
       <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX">
@@ -342,6 +342,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -445,14 +446,14 @@
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575723997" name="com.mbeddr.core.modules.structure.FunctionSignature" flags="ng" index="N3Fnt">
@@ -633,7 +634,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -661,7 +662,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
@@ -720,7 +721,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -869,7 +869,7 @@
                                 <node concept="10Nm6u" id="KU5KLY1NlH" role="3uHU7w" />
                                 <node concept="2OqwBi" id="KU5KLY1NlI" role="3uHU7B">
                                   <node concept="37vLTw" id="KU5KLY1NlJ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="KU5KLY1NlL" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2jo" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="KU5KLY1NlK" role="2OqNvi">
                                     <ref role="3Tt5mk" to="clqz:41KMvfcjBF$" resolve="init" />
@@ -878,9 +878,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="KU5KLY1NlL" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2jo" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="KU5KLY1NlM" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2jp" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2007,7 +2007,7 @@
                           <node concept="3fqX7Q" id="4WcLiIfX08q" role="3uHU7B">
                             <node concept="2OqwBi" id="4WcLiIfX08s" role="3fr31v">
                               <node concept="37vLTw" id="4WcLiIfX08t" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4WcLiIfWYkL" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2jq" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="4WcLiIfX08u" role="2OqNvi">
                                 <node concept="chp4Y" id="4WcLiIfX08v" role="cj9EA">
@@ -2023,7 +2023,7 @@
                                   <ref role="cht4Q" to="clqz:47Sr75PmDA0" resolve="EntryAction" />
                                 </node>
                                 <node concept="37vLTw" id="4WcLiIfYcam" role="1m5AlR">
-                                  <ref role="3cqZAo" node="4WcLiIfWYkL" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2jq" resolve="it" />
                                 </node>
                               </node>
                               <node concept="2qgKlT" id="4WcLiIfYcan" role="2OqNvi">
@@ -2034,9 +2034,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4WcLiIfWYkL" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2jq" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4WcLiIfWYkM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2jr" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2157,7 +2157,7 @@
                         <node concept="2OqwBi" id="1oIA7Ec_APO" role="3clFbG">
                           <node concept="2OqwBi" id="1oIA7Ec_APJ" role="2Oq$k0">
                             <node concept="37vLTw" id="1oIA7Ec_API" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1oIA7Ec_APw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2js" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1oIA7Ec_APN" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2175,9 +2175,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1oIA7Ec_APw" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2js" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1oIA7Ec_APx" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2jt" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3286,7 +3286,7 @@
                                         <node concept="2OqwBi" id="4sAjwkKHQri" role="33vP2m">
                                           <node concept="2OqwBi" id="4sAjwkKHQrj" role="2Oq$k0">
                                             <node concept="37vLTw" id="4sAjwkKHQrk" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4sAjwkKHQrR" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2ju" resolve="it" />
                                             </node>
                                             <node concept="2Rf3mk" id="4sAjwkKHQrl" role="2OqNvi">
                                               <node concept="1xMEDy" id="4sAjwkKHQrm" role="1xVPHs">
@@ -3368,9 +3368,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4sAjwkKHQrR" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2ju" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4sAjwkKHQrS" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2jv" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -5791,7 +5791,7 @@
                                 <node concept="10Nm6u" id="1_Q4fcrAtik" role="3uHU7w" />
                                 <node concept="2OqwBi" id="1_Q4fcrAthQ" role="3uHU7B">
                                   <node concept="37vLTw" id="1_Q4fcrAthx" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1_Q4fcrAthu" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2jw" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="1_Q4fcrAthW" role="2OqNvi">
                                     <ref role="37wK5l" to="ktif:7iNM$5cFWBg" resolve="duringActionStatements" />
@@ -5800,9 +5800,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1_Q4fcrAthu" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2jw" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1_Q4fcrAthv" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2jx" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -5853,15 +5853,15 @@
                                   <node concept="3clFbF" id="1_Q4fcrBIrQ" role="3cqZAp">
                                     <node concept="2OqwBi" id="1_Q4fcrBIsc" role="3clFbG">
                                       <node concept="37vLTw" id="1_Q4fcrBIrR" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1_Q4fcrBIrO" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2jy" resolve="it" />
                                       </node>
                                       <node concept="1$rogu" id="1_Q4fcrBIsh" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1_Q4fcrBIrO" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2jy" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1_Q4fcrBIrP" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2jz" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -6073,7 +6073,7 @@
                                 <node concept="2OqwBi" id="5HWuGlNH0Ny" role="37wK5m">
                                   <node concept="2OqwBi" id="5HWuGlNH0Nz" role="2Oq$k0">
                                     <node concept="37vLTw" id="5HWuGlNH0N$" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5HWuGlNH0NB" resolve="cs" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2j$" resolve="cs" />
                                     </node>
                                     <node concept="2qgKlT" id="5HWuGlNH0N_" role="2OqNvi">
                                       <ref role="37wK5l" to="ktif:47Sr75PnwHQ" resolve="entryActionStatements" />
@@ -6085,9 +6085,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5HWuGlNH0NB" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2j$" role="1bW2Oz">
                           <property role="TrG5h" value="cs" />
-                          <node concept="2jxLKc" id="5HWuGlNH0NC" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2j_" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6509,7 +6509,7 @@
                                 <node concept="2OqwBi" id="5HWuGlNH0MV" role="37wK5m">
                                   <node concept="2OqwBi" id="5HWuGlNH0MW" role="2Oq$k0">
                                     <node concept="37vLTw" id="5HWuGlNH0MX" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5HWuGlNH0N0" resolve="cs" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2jA" resolve="cs" />
                                     </node>
                                     <node concept="2qgKlT" id="5HWuGlNH0MY" role="2OqNvi">
                                       <ref role="37wK5l" to="ktif:47Sr75PnwLk" resolve="exitActionStatements" />
@@ -6521,9 +6521,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5HWuGlNH0N0" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2jA" role="1bW2Oz">
                           <property role="TrG5h" value="cs" />
-                          <node concept="2jxLKc" id="5HWuGlNH0N1" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2jB" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6560,15 +6560,15 @@
                               </node>
                               <node concept="HtI8k" id="3FSHg1aDPBp" role="2OqNvi">
                                 <node concept="37vLTw" id="3FSHg1aDPBr" role="HtI8F">
-                                  <ref role="3cqZAo" node="3FSHg1aDPAy" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2jC" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3FSHg1aDPAy" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2jC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3FSHg1aDPAz" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2jD" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6587,15 +6587,15 @@
                       <node concept="3clFbF" id="3FSHg1aDPGb" role="3cqZAp">
                         <node concept="2OqwBi" id="3FSHg1aDPGx" role="3clFbG">
                           <node concept="37vLTw" id="3FSHg1aDPGc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3FSHg1aDPG9" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2jE" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="3FSHg1aDPGB" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3FSHg1aDPG9" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2jE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3FSHg1aDPGa" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2jF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6986,7 +6986,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="17MIiXbgE8k" role="3uHU7B">
                                   <node concept="37vLTw" id="17MIiXbgDKe" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="17MIiXbg_Y0" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2jG" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="17MIiXbgK4i" role="2OqNvi">
                                     <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -6995,9 +6995,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="17MIiXbg_Y0" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2jG" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="17MIiXbg_Y1" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2jH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7012,7 +7012,7 @@
                               </node>
                               <node concept="2OqwBi" id="17MIiXbgRQ6" role="37vLTJ">
                                 <node concept="37vLTw" id="17MIiXbgRsy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="17MIiXbgRpJ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2jI" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="17MIiXbgYbg" role="2OqNvi">
                                   <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -7021,9 +7021,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="17MIiXbgRpJ" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2jI" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="17MIiXbgRpK" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2jJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -7086,7 +7086,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="2XWa8zowmsX" role="3uHU7B">
                                   <node concept="37vLTw" id="2XWa8zowmgi" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2XWa8zowm3q" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2jK" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2XWa8zownTD" role="2OqNvi">
                                     <ref role="3Tt5mk" to="clqz:3FSHg1aBC0S" resolve="initial" />
@@ -7095,9 +7095,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2XWa8zowm3q" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2jK" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2XWa8zowm3r" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2jL" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7112,7 +7112,7 @@
                               </node>
                               <node concept="2OqwBi" id="2XWa8zowsRy" role="37vLTJ">
                                 <node concept="37vLTw" id="2XWa8zowsft" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2XWa8zowscC" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2jM" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="2XWa8zowuHv" role="2OqNvi">
                                   <ref role="3Tt5mk" to="clqz:3FSHg1aBC0S" resolve="initial" />
@@ -7121,9 +7121,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2XWa8zowscC" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2jM" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2XWa8zowscD" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2jN" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -7556,7 +7556,7 @@
                                   <node concept="2OqwBi" id="3TCD4YF3HRx" role="3clFbG">
                                     <node concept="2OqwBi" id="3TCD4YF3HRy" role="2Oq$k0">
                                       <node concept="37vLTw" id="3TCD4YF3HRz" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3TCD4YF3HRI" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2jQ" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="3TCD4YF3HR$" role="2OqNvi">
                                         <ref role="37wK5l" to="ktif:47Sr75PnwFP" resolve="transitions" />
@@ -7568,7 +7568,7 @@
                                           <node concept="3clFbF" id="3TCD4YF3HRC" role="3cqZAp">
                                             <node concept="2OqwBi" id="3TCD4YF3HRD" role="3clFbG">
                                               <node concept="37vLTw" id="3TCD4YF3HRE" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3TCD4YF3HRG" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2jO" resolve="it" />
                                               </node>
                                               <node concept="2qgKlT" id="3TCD4YF3HRF" role="2OqNvi">
                                                 <ref role="37wK5l" to="ktif:16ykm_MicVJ" resolve="isEpsilon" />
@@ -7576,18 +7576,18 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="3TCD4YF3HRG" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN2jO" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="3TCD4YF3HRH" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN2jP" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3TCD4YF3HRI" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2jQ" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3TCD4YF3HRJ" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2jR" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -7603,7 +7603,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="16ykm_LT0FP" role="33vP2m">
                                     <node concept="37vLTw" id="3TCD4YF3WJr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3TCD4YF3Tlg" resolve="state" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2jS" resolve="state" />
                                     </node>
                                     <node concept="2qgKlT" id="16ykm_LT4PV" role="2OqNvi">
                                       <ref role="37wK5l" to="ktif:4oSz90jlvmt" resolve="entryAction" />
@@ -7631,7 +7631,7 @@
                                     <node concept="2OqwBi" id="16ykm_LTdf1" role="3clFbG">
                                       <node concept="2OqwBi" id="16ykm_LT5Oy" role="2Oq$k0">
                                         <node concept="37vLTw" id="3TCD4YF3Yjp" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3TCD4YF3Tlg" resolve="state" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2jS" resolve="state" />
                                         </node>
                                         <node concept="3Tsc0h" id="16ykm_LTa1w" role="2OqNvi">
                                           <ref role="3TtcxE" to="clqz:3FSHg1aAGGX" resolve="contents" />
@@ -7701,7 +7701,7 @@
                                   <ref role="1Pybhc" to="fwk:~TracingUtil" resolve="TracingUtil" />
                                   <ref role="37wK5l" to="fwk:~TracingUtil.fillOriginalNode(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode,boolean)" resolve="fillOriginalNode" />
                                   <node concept="37vLTw" id="3TCD4YF4gU_" role="37wK5m">
-                                    <ref role="3cqZAo" node="3TCD4YF3Tlg" resolve="state" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2jS" resolve="state" />
                                   </node>
                                   <node concept="37vLTw" id="602uc2JT_NS" role="37wK5m">
                                     <ref role="3cqZAo" node="602uc2JTvsw" resolve="triggerStatement" />
@@ -7712,9 +7712,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3TCD4YF3Tlg" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2jS" role="1bW2Oz">
                               <property role="TrG5h" value="state" />
-                              <node concept="2jxLKc" id="3TCD4YF3Tlh" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2jT" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -9035,7 +9035,7 @@
                                                                     <node concept="2OqwBi" id="4c3N3BOAIou" role="3clFbG">
                                                                       <node concept="2OqwBi" id="4c3N3BOAIov" role="2Oq$k0">
                                                                         <node concept="37vLTw" id="4c3N3BOAIow" role="2Oq$k0">
-                                                                          <ref role="3cqZAo" node="4c3N3BOAIo$" resolve="it" />
+                                                                          <ref role="3cqZAo" node="2SR9xrsN2jU" resolve="it" />
                                                                         </node>
                                                                         <node concept="3TrEf2" id="4c3N3BOAIox" role="2OqNvi">
                                                                           <ref role="3Tt5mk" to="c4fa:6iIoqg1yCmj" resolve="expr" />
@@ -9049,9 +9049,9 @@
                                                                     </node>
                                                                   </node>
                                                                 </node>
-                                                                <node concept="Rh6nW" id="4c3N3BOAIo$" role="1bW2Oz">
+                                                                <node concept="gl6BB" id="2SR9xrsN2jU" role="1bW2Oz">
                                                                   <property role="TrG5h" value="it" />
-                                                                  <node concept="2jxLKc" id="4c3N3BOAIo_" role="1tU5fm" />
+                                                                  <node concept="2jxLKc" id="2SR9xrsN2jV" role="1tU5fm" />
                                                                 </node>
                                                               </node>
                                                             </node>
@@ -9256,7 +9256,7 @@
                                                         <node concept="2OqwBi" id="4c3N3BOAIpF" role="3uHU7B">
                                                           <node concept="2OqwBi" id="4c3N3BOAIpG" role="2Oq$k0">
                                                             <node concept="37vLTw" id="4c3N3BOAIpH" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="4c3N3BOAIpK" resolve="it" />
+                                                              <ref role="3cqZAo" node="2SR9xrsN2jW" resolve="it" />
                                                             </node>
                                                             <node concept="3TrEf2" id="4c3N3BOAIpI" role="2OqNvi">
                                                               <ref role="3Tt5mk" to="clqz:3bLw7MCtNTe" resolve="trigger" />
@@ -9269,9 +9269,9 @@
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="Rh6nW" id="4c3N3BOAIpK" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="2SR9xrsN2jW" role="1bW2Oz">
                                                     <property role="TrG5h" value="it" />
-                                                    <node concept="2jxLKc" id="4c3N3BOAIpL" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="2SR9xrsN2jX" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -9324,7 +9324,7 @@
                                                       <node concept="2OqwBi" id="4c3N3BOAIq9" role="3uHU7B">
                                                         <node concept="2OqwBi" id="4c3N3BOAIqa" role="2Oq$k0">
                                                           <node concept="37vLTw" id="4c3N3BOAIqb" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="4c3N3BOAIqe" resolve="it" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN2jY" resolve="it" />
                                                           </node>
                                                           <node concept="3TrEf2" id="4c3N3BOAIqc" role="2OqNvi">
                                                             <ref role="3Tt5mk" to="clqz:3bLw7MCtNTe" resolve="trigger" />
@@ -9337,9 +9337,9 @@
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="Rh6nW" id="4c3N3BOAIqe" role="1bW2Oz">
+                                                <node concept="gl6BB" id="2SR9xrsN2jY" role="1bW2Oz">
                                                   <property role="TrG5h" value="it" />
-                                                  <node concept="2jxLKc" id="4c3N3BOAIqf" role="1tU5fm" />
+                                                  <node concept="2jxLKc" id="2SR9xrsN2jZ" role="1tU5fm" />
                                                 </node>
                                               </node>
                                             </node>
@@ -9408,7 +9408,7 @@
                                                           <node concept="2OqwBi" id="4c3N3BOAIqK" role="2Oq$k0">
                                                             <node concept="2OqwBi" id="4c3N3BOAIqL" role="2Oq$k0">
                                                               <node concept="37vLTw" id="4c3N3BOAIqM" role="2Oq$k0">
-                                                                <ref role="3cqZAo" node="4c3N3BOAIr6" resolve="it" />
+                                                                <ref role="3cqZAo" node="2SR9xrsN2k2" resolve="it" />
                                                               </node>
                                                               <node concept="3TrEf2" id="4c3N3BOAIqN" role="2OqNvi">
                                                                 <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" resolve="thenPart" />
@@ -9424,7 +9424,7 @@
                                                                 <node concept="3clFbF" id="4c3N3BOAIqS" role="3cqZAp">
                                                                   <node concept="2OqwBi" id="4c3N3BOAIqT" role="3clFbG">
                                                                     <node concept="37vLTw" id="4c3N3BOAIqU" role="2Oq$k0">
-                                                                      <ref role="3cqZAo" node="4c3N3BOAIqX" resolve="it" />
+                                                                      <ref role="3cqZAo" node="2SR9xrsN2k0" resolve="it" />
                                                                     </node>
                                                                     <node concept="1mIQ4w" id="4c3N3BOAIqV" role="2OqNvi">
                                                                       <node concept="chp4Y" id="4c3N3BOAIqW" role="cj9EA">
@@ -9434,9 +9434,9 @@
                                                                   </node>
                                                                 </node>
                                                               </node>
-                                                              <node concept="Rh6nW" id="4c3N3BOAIqX" role="1bW2Oz">
+                                                              <node concept="gl6BB" id="2SR9xrsN2k0" role="1bW2Oz">
                                                                 <property role="TrG5h" value="it" />
-                                                                <node concept="2jxLKc" id="4c3N3BOAIqY" role="1tU5fm" />
+                                                                <node concept="2jxLKc" id="2SR9xrsN2k1" role="1tU5fm" />
                                                               </node>
                                                             </node>
                                                           </node>
@@ -9445,7 +9445,7 @@
                                                           <node concept="2OqwBi" id="4c3N3BOAIr0" role="2Oq$k0">
                                                             <node concept="2OqwBi" id="4c3N3BOAIr1" role="2Oq$k0">
                                                               <node concept="37vLTw" id="4c3N3BOAIr2" role="2Oq$k0">
-                                                                <ref role="3cqZAo" node="4c3N3BOAIr6" resolve="it" />
+                                                                <ref role="3cqZAo" node="2SR9xrsN2k2" resolve="it" />
                                                               </node>
                                                               <node concept="3TrEf2" id="4c3N3BOAIr3" role="2OqNvi">
                                                                 <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" resolve="thenPart" />
@@ -9460,9 +9460,9 @@
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="Rh6nW" id="4c3N3BOAIr6" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="2SR9xrsN2k2" role="1bW2Oz">
                                                     <property role="TrG5h" value="it" />
-                                                    <node concept="2jxLKc" id="4c3N3BOAIr7" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="2SR9xrsN2k3" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -9473,15 +9473,15 @@
                                                   <node concept="3clFbF" id="4c3N3BOAIrb" role="3cqZAp">
                                                     <node concept="2OqwBi" id="4c3N3BOAIrc" role="3clFbG">
                                                       <node concept="37vLTw" id="4c3N3BOAIrd" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4c3N3BOAIrf" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN2k4" resolve="it" />
                                                       </node>
                                                       <node concept="3YRAZt" id="4c3N3BOAIre" role="2OqNvi" />
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="Rh6nW" id="4c3N3BOAIrf" role="1bW2Oz">
+                                                <node concept="gl6BB" id="2SR9xrsN2k4" role="1bW2Oz">
                                                   <property role="TrG5h" value="it" />
-                                                  <node concept="2jxLKc" id="4c3N3BOAIrg" role="1tU5fm" />
+                                                  <node concept="2jxLKc" id="2SR9xrsN2k5" role="1tU5fm" />
                                                 </node>
                                               </node>
                                             </node>
@@ -9610,7 +9610,7 @@
                                                       <node concept="2OqwBi" id="4c3N3BOAIsb" role="3clFbG">
                                                         <node concept="2OqwBi" id="4c3N3BOAIsc" role="2Oq$k0">
                                                           <node concept="37vLTw" id="4c3N3BOAIsd" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="4c3N3BOAIsh" resolve="it" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN2k6" resolve="it" />
                                                           </node>
                                                           <node concept="3TrEf2" id="4c3N3BOAIse" role="2OqNvi">
                                                             <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvo" resolve="condition" />
@@ -9624,9 +9624,9 @@
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="Rh6nW" id="4c3N3BOAIsh" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="2SR9xrsN2k6" role="1bW2Oz">
                                                     <property role="TrG5h" value="it" />
-                                                    <node concept="2jxLKc" id="4c3N3BOAIsi" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="2SR9xrsN2k7" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -9642,7 +9642,7 @@
                                                       <node concept="2OqwBi" id="4c3N3BOAIsp" role="37vLTJ">
                                                         <node concept="2OqwBi" id="4c3N3BOAIsq" role="2Oq$k0">
                                                           <node concept="37vLTw" id="4c3N3BOAIsr" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="4c3N3BOAIs_" resolve="it" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN2k8" resolve="it" />
                                                           </node>
                                                           <node concept="3TrEf2" id="4c3N3BOAIss" role="2OqNvi">
                                                             <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" resolve="thenPart" />
@@ -9657,12 +9657,12 @@
                                                   <node concept="3clFbF" id="4c3N3BOAIsu" role="3cqZAp">
                                                     <node concept="2OqwBi" id="4c3N3BOAIsv" role="3clFbG">
                                                       <node concept="37vLTw" id="4c3N3BOAIsw" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4c3N3BOAIs_" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN2k8" resolve="it" />
                                                       </node>
                                                       <node concept="1P9Npp" id="4c3N3BOAIsx" role="2OqNvi">
                                                         <node concept="2OqwBi" id="4c3N3BOAIsy" role="1P9ThW">
                                                           <node concept="37vLTw" id="4c3N3BOAIsz" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="4c3N3BOAIs_" resolve="it" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN2k8" resolve="it" />
                                                           </node>
                                                           <node concept="3TrEf2" id="4c3N3BOAIs$" role="2OqNvi">
                                                             <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" resolve="thenPart" />
@@ -9672,9 +9672,9 @@
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="Rh6nW" id="4c3N3BOAIs_" role="1bW2Oz">
+                                                <node concept="gl6BB" id="2SR9xrsN2k8" role="1bW2Oz">
                                                   <property role="TrG5h" value="it" />
-                                                  <node concept="2jxLKc" id="4c3N3BOAIsA" role="1tU5fm" />
+                                                  <node concept="2jxLKc" id="2SR9xrsN2k9" role="1tU5fm" />
                                                 </node>
                                               </node>
                                             </node>
@@ -9776,7 +9776,7 @@
                                                 <node concept="2OqwBi" id="4c3N3BOAItj" role="3clFbG">
                                                   <node concept="2OqwBi" id="4c3N3BOAItk" role="2Oq$k0">
                                                     <node concept="37vLTw" id="4c3N3BOAItl" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4c3N3BOAItr" resolve="a" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2ka" resolve="a" />
                                                     </node>
                                                     <node concept="3TrcHB" id="4c3N3BOAItm" role="2OqNvi">
                                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -9786,7 +9786,7 @@
                                                     <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
                                                     <node concept="2OqwBi" id="4c3N3BOAIto" role="37wK5m">
                                                       <node concept="37vLTw" id="4c3N3BOAItp" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4c3N3BOAItt" resolve="b" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN2kc" resolve="b" />
                                                       </node>
                                                       <node concept="3TrcHB" id="4c3N3BOAItq" role="2OqNvi">
                                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -9796,13 +9796,13 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="4c3N3BOAItr" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN2ka" role="1bW2Oz">
                                               <property role="TrG5h" value="a" />
-                                              <node concept="2jxLKc" id="4c3N3BOAIts" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN2kb" role="1tU5fm" />
                                             </node>
-                                            <node concept="Rh6nW" id="4c3N3BOAItt" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN2kc" role="1bW2Oz">
                                               <property role="TrG5h" value="b" />
-                                              <node concept="2jxLKc" id="4c3N3BOAItu" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN2kd" role="1tU5fm" />
                                             </node>
                                           </node>
                                           <node concept="1nlBCl" id="4c3N3BOAItv" role="2Dq5b$">
@@ -9852,15 +9852,15 @@
                                                   <node concept="2qgKlT" id="4c3N3BOAItR" role="2OqNvi">
                                                     <ref role="37wK5l" to="ktif:25eqerYmQSA" resolve="removeEmptyLineBefore" />
                                                     <node concept="37vLTw" id="4c3N3BOAItS" role="37wK5m">
-                                                      <ref role="3cqZAo" node="4c3N3BOAItT" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2ke" resolve="it" />
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="4c3N3BOAItT" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN2ke" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="4c3N3BOAItU" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN2kf" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -10133,7 +10133,7 @@
                       <node concept="3clFbF" id="4c3N3BOEXVH" role="3cqZAp">
                         <node concept="2OqwBi" id="4c3N3BOEY7f" role="3clFbG">
                           <node concept="37vLTw" id="4c3N3BOEXVG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4c3N3BOEXSO" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2kg" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4c3N3BOEYpR" role="2OqNvi">
                             <ref role="37wK5l" to="ktif:4c3N3BNA7XU" resolve="getStatemachine" />
@@ -10141,9 +10141,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4c3N3BOEXSO" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2kg" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4c3N3BOEXSP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2kh" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10159,7 +10159,7 @@
                         <node concept="2OqwBi" id="4c3N3BOFjoz" role="3clFbG">
                           <node concept="2OqwBi" id="4c3N3BOFjo$" role="2Oq$k0">
                             <node concept="37vLTw" id="4c3N3BOFjM3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4c3N3BOFjmG" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2kk" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="4c3N3BOFjoA" role="2OqNvi">
                               <ref role="3TtcxE" to="clqz:6MWlM491tWI" resolve="contents" />
@@ -10183,7 +10183,7 @@
                     <node concept="1Wc70l" id="3TJMuIK8Nn9" role="3clFbw">
                       <node concept="2OqwBi" id="3TJMuIK8OqY" role="3uHU7B">
                         <node concept="37vLTw" id="3TJMuIK8NEr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4c3N3BOFjmG" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kk" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5yFZkJSrFFr" role="2OqNvi">
                           <ref role="37wK5l" to="ktif:5yFZkJSruhv" resolve="hasPostponableInitialExecution" />
@@ -10193,7 +10193,7 @@
                         <node concept="2OqwBi" id="4fnktPowS3g" role="3fr31v">
                           <node concept="2OqwBi" id="4fnktPowS3h" role="2Oq$k0">
                             <node concept="37vLTw" id="4fnktPowS3i" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4c3N3BOFjmG" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2kk" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="4fnktPowS3j" role="2OqNvi">
                               <ref role="3TtcxE" to="clqz:6MWlM491tWI" resolve="contents" />
@@ -10205,7 +10205,7 @@
                                 <node concept="3clFbF" id="4fnktPowS3n" role="3cqZAp">
                                   <node concept="2OqwBi" id="4fnktPowS3o" role="3clFbG">
                                     <node concept="37vLTw" id="4fnktPowS3p" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4fnktPowS3s" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2ki" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="4fnktPowS3q" role="2OqNvi">
                                       <node concept="chp4Y" id="4fnktPowS3r" role="cj9EA">
@@ -10215,9 +10215,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4fnktPowS3s" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2ki" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4fnktPowS3t" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2kj" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -10226,9 +10226,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4c3N3BOFjmG" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2kk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4c3N3BOFjmH" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2kl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11032,7 +11032,7 @@
                                                     <ref role="37wK5l" to="ktif:4oSz90jlvmt" resolve="entryAction" />
                                                   </node>
                                                   <node concept="37vLTw" id="3TJMuIK6$FH" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="3TJMuIK6$FJ" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2km" resolve="it" />
                                                   </node>
                                                 </node>
                                                 <node concept="3x8VRR" id="4sAjwkRQAXk" role="2OqNvi" />
@@ -11041,7 +11041,7 @@
                                                 <node concept="2OqwBi" id="3TJMuIK6$F$" role="2Oq$k0">
                                                   <node concept="2OqwBi" id="3TJMuIK6$F_" role="2Oq$k0">
                                                     <node concept="37vLTw" id="3TJMuIK6$FA" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="3TJMuIK6$FJ" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2km" resolve="it" />
                                                     </node>
                                                     <node concept="2qgKlT" id="3TJMuIK6$FB" role="2OqNvi">
                                                       <ref role="37wK5l" to="ktif:47Sr75PnwHQ" resolve="entryActionStatements" />
@@ -11060,7 +11060,7 @@
                                               <node concept="2OqwBi" id="4sAjwkRQQG6" role="3uHU7B">
                                                 <node concept="2OqwBi" id="4sAjwkRQQG7" role="2Oq$k0">
                                                   <node concept="37vLTw" id="4sAjwkRR291" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="3TJMuIK6$FJ" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2km" resolve="it" />
                                                   </node>
                                                   <node concept="2qgKlT" id="4sAjwkRQQG9" role="2OqNvi">
                                                     <ref role="37wK5l" to="ktif:7iNM$5cFWBg" resolve="duringActionStatements" />
@@ -11072,7 +11072,7 @@
                                                 <node concept="2OqwBi" id="4sAjwkRQRJZ" role="2Oq$k0">
                                                   <node concept="2OqwBi" id="4sAjwkRQRK0" role="2Oq$k0">
                                                     <node concept="37vLTw" id="4sAjwkRR2dt" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="3TJMuIK6$FJ" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2km" resolve="it" />
                                                     </node>
                                                     <node concept="2qgKlT" id="4sAjwkRQRK2" role="2OqNvi">
                                                       <ref role="37wK5l" to="ktif:7iNM$5cFWBg" resolve="duringActionStatements" />
@@ -11089,9 +11089,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3TJMuIK6$FJ" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2km" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="3TJMuIK6$FK" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2kn" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -11183,7 +11183,7 @@
                     <node concept="3clFbF" id="3TJMuIMtuRK" role="3cqZAp">
                       <node concept="2OqwBi" id="3$f8hf_cM6d" role="3clFbG">
                         <node concept="37vLTw" id="3$f8hf_cLxy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3TJMuIMtuMB" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2ko" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3$f8hf_cNha" role="2OqNvi">
                           <ref role="37wK5l" to="ktif:3$f8hf_cqT1" resolve="hasDerivedInitialState" />
@@ -11191,9 +11191,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3TJMuIMtuMB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2ko" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3TJMuIMtuMC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11206,7 +11206,7 @@
                       <node concept="2OqwBi" id="3TJMuIMxyHm" role="37vLTx">
                         <node concept="2OqwBi" id="3TJMuIMxxjZ" role="2Oq$k0">
                           <node concept="37vLTw" id="3TJMuIMxwKM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3TJMuIMty4_" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2kq" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="3TJMuIMxykl" role="2OqNvi">
                             <node concept="3CFYIy" id="3TJMuIMxys2" role="3CFYIz">
@@ -11220,7 +11220,7 @@
                       </node>
                       <node concept="2OqwBi" id="3TJMuIMxuW$" role="37vLTJ">
                         <node concept="37vLTw" id="3TJMuIMxupC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3TJMuIMty4_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kq" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3TJMuIMxw8V" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:3TJMuIMxu7g" resolve="derivedInitialExpr" />
@@ -11229,9 +11229,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3TJMuIMty4_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2kq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3TJMuIMty4A" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2kr" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageAccessories/com/mbeddr/ext/statemachines/utils.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageAccessories/com/mbeddr/ext/statemachines/utils.mps
index 1a5a1d0e89c..fcd4fff5cd0 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageAccessories/com/mbeddr/ext/statemachines/utils.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageAccessories/com/mbeddr/ext/statemachines/utils.mps
@@ -69,7 +69,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,7 +79,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -95,7 +95,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/behavior.mps
index 810955aab4f..707fe79d5db 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/behavior.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:7581afdf-2eec-4ad5-b583-8a9ab51847f7(com.mbeddr.ext.statemachines.behavior)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
@@ -158,7 +159,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -171,7 +172,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -187,6 +188,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -318,7 +320,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -355,7 +357,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -738,12 +739,12 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="3TJMuIKNAZT" role="3uHU7B">
-                            <ref role="3cqZAo" node="3TJMuIKNAZZ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2he" resolve="it" />
                           </node>
                         </node>
                         <node concept="17R0WA" id="3TJMuIKNAZU" role="3uHU7B">
                           <node concept="37vLTw" id="3TJMuIKNAZV" role="3uHU7B">
-                            <ref role="3cqZAo" node="3TJMuIKNAZZ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2he" resolve="it" />
                           </node>
                           <node concept="2OqwBi" id="3TJMuIKNAZW" role="3uHU7w">
                             <node concept="13iPFW" id="3TJMuIKNAZX" role="2Oq$k0" />
@@ -755,9 +756,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3TJMuIKNAZZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2he" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3TJMuIKNB00" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hf" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1001,7 +1002,7 @@
                         <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
                         <node concept="2OqwBi" id="38XGACK0je1" role="37wK5m">
                           <node concept="37vLTw" id="38XGACK0jrh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="38XGACK0iS1" resolve="state" />
+                            <ref role="3cqZAo" node="2SR9xrsN2hi" resolve="state" />
                           </node>
                           <node concept="2qgKlT" id="38XGACK0je3" role="2OqNvi">
                             <ref role="37wK5l" node="1oIA7Ec_GUC" resolve="genCEnumLiteralName" />
@@ -1011,9 +1012,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="38XGACK0iS1" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hi" role="1bW2Oz">
                   <property role="TrG5h" value="state" />
-                  <node concept="2jxLKc" id="38XGACK0iS2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1138,7 +1139,7 @@
                   <node concept="3clFbF" id="6xkj9mMsHj" role="3cqZAp">
                     <node concept="2OqwBi" id="6xkj9mMsHD" role="3clFbG">
                       <node concept="37vLTw" id="6xkj9mMsHk" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6xkj9mMsHh" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2hk" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6xkj9mMsRa" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:6xkj9mMr7e" resolve="visualize" />
@@ -1152,9 +1153,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6xkj9mMsHh" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6xkj9mMsHi" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1443,7 +1444,7 @@
                     <node concept="2OqwBi" id="3TCD4YLgyNU" role="3clFbG">
                       <node concept="2OqwBi" id="3TCD4YLgspU" role="2Oq$k0">
                         <node concept="37vLTw" id="3TCD4YLgrYW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3TCD4YLgrR5" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2hq" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3TCD4YLgyfV" role="2OqNvi">
                           <ref role="37wK5l" node="4oSz90jlvmt" resolve="entryAction" />
@@ -1455,9 +1456,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3TCD4YLgrR5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3TCD4YLgrR6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2205,7 +2206,7 @@
                         <ref role="3cqZAo" node="6xkj9mMsHQ" resolve="g" />
                       </node>
                       <node concept="37vLTw" id="17MIiXbDzoS" role="37wK5m">
-                        <ref role="3cqZAo" node="17MIiXbDzoU" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2hs" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="17MIiXbDzoT" role="37wK5m">
                         <ref role="3cqZAo" node="6RCWEZG3Hvp" resolve="category" />
@@ -2213,9 +2214,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="17MIiXbDzoU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="17MIiXbDzoV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ht" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2709,7 +2710,7 @@
                             <node concept="2OqwBi" id="4YQmo8tIq_F" role="3uHU7B">
                               <node concept="2OqwBi" id="4YQmo8tIq_G" role="2Oq$k0">
                                 <node concept="37vLTw" id="4YQmo8tIq_H" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4YQmo8tIqA2" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2hA" resolve="it" />
                                 </node>
                                 <node concept="2yIwOk" id="4YQmo8tIq_I" role="2OqNvi" />
                               </node>
@@ -2721,7 +2722,7 @@
                             </node>
                             <node concept="2OqwBi" id="4YQmo8tIq_L" role="3uHU7w">
                               <node concept="37vLTw" id="4YQmo8tIq_M" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4YQmo8tIqA2" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2hA" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="4YQmo8tIq_N" role="2OqNvi">
                                 <node concept="chp4Y" id="4YQmo8tIq_O" role="cj9EA">
@@ -2732,7 +2733,7 @@
                           </node>
                           <node concept="2OqwBi" id="4YQmo8tIq_P" role="3uHU7w">
                             <node concept="37vLTw" id="4YQmo8tIq_Q" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4YQmo8tIqA2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2hA" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="4YQmo8tIq_R" role="2OqNvi">
                               <node concept="chp4Y" id="4YQmo8tIq_S" role="cj9EA">
@@ -2745,7 +2746,7 @@
                           <node concept="2OqwBi" id="4YQmo8tIq_U" role="2Oq$k0">
                             <node concept="2OqwBi" id="4YQmo8tIq_V" role="2Oq$k0">
                               <node concept="37vLTw" id="4YQmo8tIq_W" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4YQmo8tIqA2" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2hA" resolve="it" />
                               </node>
                               <node concept="z$bX8" id="4YQmo8tIq_X" role="2OqNvi">
                                 <node concept="1xIGOp" id="4YQmo8tIq_Y" role="1xVPHs" />
@@ -2762,9 +2763,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4YQmo8tIqA2" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2hA" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4YQmo8tIqA3" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2789,7 +2790,7 @@
                     <node concept="3clFbF" id="4WcLiIfY8vG" role="3cqZAp">
                       <node concept="2OqwBi" id="4WcLiIfY8vH" role="3clFbG">
                         <node concept="37vLTw" id="4WcLiIfY8vI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4WcLiIfY8vL" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2hC" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4WcLiIfY8vJ" role="2OqNvi">
                           <node concept="chp4Y" id="4WcLiIfY8vK" role="cj9EA">
@@ -2799,9 +2800,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4WcLiIfY8vL" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2hC" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4WcLiIfY8vM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2994,7 +2995,7 @@
                     <node concept="3clFbF" id="47Sr75PnwJy" role="3cqZAp">
                       <node concept="2OqwBi" id="47Sr75PnwJz" role="3clFbG">
                         <node concept="37vLTw" id="47Sr75PnwJ$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="47Sr75PnwJB" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2hE" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="47Sr75PnwJ_" role="2OqNvi">
                           <node concept="chp4Y" id="47Sr75PnwJA" role="cj9EA">
@@ -3004,9 +3005,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="47Sr75PnwJB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2hE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="47Sr75PnwJC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3096,7 +3097,7 @@
                     <node concept="3clFbF" id="47Sr75PnwLx" role="3cqZAp">
                       <node concept="2OqwBi" id="47Sr75PnwLy" role="3clFbG">
                         <node concept="37vLTw" id="47Sr75PnwLz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="47Sr75PnwLA" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2hG" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="47Sr75PnwL$" role="2OqNvi">
                           <node concept="chp4Y" id="47Sr75PnwLP" role="cj9EA">
@@ -3106,9 +3107,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="47Sr75PnwLA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2hG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="47Sr75PnwLB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3198,7 +3199,7 @@
                     <node concept="3clFbF" id="7iNM$5cFWBt" role="3cqZAp">
                       <node concept="2OqwBi" id="7iNM$5cFWBu" role="3clFbG">
                         <node concept="37vLTw" id="7iNM$5cFWBv" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7iNM$5cFWBy" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2hI" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="7iNM$5cFWBw" role="2OqNvi">
                           <node concept="chp4Y" id="7iNM$5cFWBL" role="cj9EA">
@@ -3208,9 +3209,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7iNM$5cFWBy" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2hI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7iNM$5cFWBz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3423,7 +3424,7 @@
                           </node>
                           <node concept="2OqwBi" id="3FSHg1aCmPf" role="3uHU7w">
                             <node concept="37vLTw" id="3FSHg1aCmOU" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3FSHg1aCmOs" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2hK" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3FSHg1aCmPl" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3437,9 +3438,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="3FSHg1aCmOw" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="3FSHg1aCmOs" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2hK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3FSHg1aCmOt" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hL" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="3FSHg1aCmOv" role="1MDeny" />
@@ -3476,7 +3477,7 @@
                   <node concept="3clFbF" id="3FSHg1aCW2a" role="3cqZAp">
                     <node concept="2OqwBi" id="3FSHg1aCW2w" role="3clFbG">
                       <node concept="37vLTw" id="3FSHg1aCW2b" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3FSHg1aCW28" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2hM" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3FSHg1aCW2A" role="2OqNvi">
                         <ref role="37wK5l" node="3FSHg1aCVUC" resolve="states" />
@@ -3484,9 +3485,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3FSHg1aCW28" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3FSHg1aCW29" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3552,7 +3553,7 @@
                     <node concept="3cpWs3" id="3yz4Elavg$l" role="3clFbG">
                       <node concept="2OqwBi" id="3yz4Elavg$H" role="3uHU7w">
                         <node concept="37vLTw" id="3yz4Elavg$o" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3yz4Elavgzy" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2hO" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="3yz4Elavg$N" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3568,9 +3569,9 @@
                   <property role="TrG5h" value="s" />
                   <node concept="17QB3L" id="3yz4ElavgzA" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="3yz4Elavgzy" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3yz4Elavgzz" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hP" role="1tU5fm" />
                 </node>
               </node>
               <node concept="Xl_RD" id="3yz4ElavqFy" role="1MDeny">
@@ -3883,15 +3884,15 @@
                     <node concept="3cpWs3" id="6xkj9mMsM$" role="3uHU7B">
                       <node concept="3cpWs3" id="6xkj9mMsLk" role="3uHU7B">
                         <node concept="3cpWs3" id="5YZjOkvyMq_" role="3uHU7B">
+                          <node concept="37vLTw" id="20ezT9ZBY9x" role="3uHU7w">
+                            <ref role="3cqZAo" node="5YZjOkvyMp_" resolve="direction" />
+                          </node>
                           <node concept="2OqwBi" id="6xkj9mMsKx" role="3uHU7B">
                             <node concept="13iPFW" id="6xkj9mMsKc" role="2Oq$k0" />
                             <node concept="2qgKlT" id="3yz4ElauWl5" role="2OqNvi">
                               <ref role="37wK5l" node="3yz4ElauWkt" resolve="nameInGraph" />
                             </node>
                           </node>
-                          <node concept="37vLTw" id="20ezT9ZBY9x" role="3uHU7w">
-                            <ref role="3cqZAo" node="5YZjOkvyMp_" resolve="direction" />
-                          </node>
                         </node>
                         <node concept="2OqwBi" id="6xkj9mMsM8" role="3uHU7w">
                           <node concept="2OqwBi" id="6xkj9mMsLG" role="2Oq$k0">
@@ -4314,7 +4315,7 @@
                     <node concept="3clFbF" id="3TCD4YFmZks" role="3cqZAp">
                       <node concept="2OqwBi" id="3TCD4YFmZkt" role="3clFbG">
                         <node concept="37vLTw" id="3TCD4YFmZku" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3TCD4YFmZkw" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2hQ" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3TCD4YFmZkv" role="2OqNvi">
                           <ref role="37wK5l" node="16ykm_MicVJ" resolve="isEpsilon" />
@@ -4322,9 +4323,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3TCD4YFmZkw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2hQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3TCD4YFmZkx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2hR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4545,7 +4546,7 @@
                               <node concept="2OqwBi" id="4h2fJwlR2ZL" role="3clFbG">
                                 <node concept="2OqwBi" id="4h2fJwlR2ZM" role="2Oq$k0">
                                   <node concept="37vLTw" id="4h2fJwlR2ZN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4h2fJwlR2ZR" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2hS" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4h2fJwlR2ZO" role="2OqNvi">
                                     <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -4559,9 +4560,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4h2fJwlR2ZR" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2hS" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4h2fJwlR2ZS" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2hT" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4822,7 +4823,7 @@
                   <node concept="3clFbF" id="4uNzyVLWqMP" role="3cqZAp">
                     <node concept="2OqwBi" id="4uNzyVLWqNb" role="3clFbG">
                       <node concept="37vLTw" id="4uNzyVLWqMQ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6xkj9mMsQX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2hU" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4uNzyVLWqNh" role="2OqNvi">
                         <ref role="37wK5l" to="hwgx:6xkj9mMr7e" resolve="visualize" />
@@ -4836,9 +4837,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6xkj9mMsQX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6xkj9mMsQY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hV" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4862,7 +4863,7 @@
                         <ref role="3cqZAo" node="6xkj9mMsOy" resolve="g" />
                       </node>
                       <node concept="37vLTw" id="5YZjOkvyMrJ" role="37wK5m">
-                        <ref role="3cqZAo" node="5YZjOkvyMrL" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2hW" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="5YZjOkvyMrK" role="37wK5m">
                         <ref role="3cqZAo" node="6RCWEZG3Hvt" resolve="category" />
@@ -4870,9 +4871,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5YZjOkvyMrL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5YZjOkvyMrM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hX" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5728,7 +5729,7 @@
                         </node>
                         <node concept="3JPx81" id="4h2fJwlSbrV" role="2OqNvi">
                           <node concept="37vLTw" id="4h2fJwlSbrX" role="25WWJ7">
-                            <ref role="3cqZAo" node="4h2fJwlSbrp" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2hY" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -5741,7 +5742,7 @@
                           </node>
                           <node concept="TSZUe" id="4h2fJwlSbsq" role="2OqNvi">
                             <node concept="37vLTw" id="4h2fJwlSbss" role="25WWJ7">
-                              <ref role="3cqZAo" node="4h2fJwlSbrp" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2hY" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -5749,9 +5750,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4h2fJwlSbrp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2hY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4h2fJwlSbrq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2hZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5848,7 +5849,7 @@
                         </node>
                         <node concept="3JPx81" id="4h2fJwlT34E" role="2OqNvi">
                           <node concept="37vLTw" id="4h2fJwlT34F" role="25WWJ7">
-                            <ref role="3cqZAo" node="4h2fJwlT34M" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2i0" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -5861,7 +5862,7 @@
                           </node>
                           <node concept="TSZUe" id="4h2fJwlT34K" role="2OqNvi">
                             <node concept="37vLTw" id="4h2fJwlT34L" role="25WWJ7">
-                              <ref role="3cqZAo" node="4h2fJwlT34M" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2i0" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -5869,9 +5870,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4h2fJwlT34M" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2i0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4h2fJwlT34N" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2i1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6103,15 +6104,15 @@
                                   </node>
                                   <node concept="HtX7F" id="4h2fJwlT33X" role="2OqNvi">
                                     <node concept="37vLTw" id="5yVrpGYDXFv" role="HtX7I">
-                                      <ref role="3cqZAo" node="5yVrpGYDXbC" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2i2" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5yVrpGYDXbC" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2i2" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5yVrpGYDXbD" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2i3" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -6264,15 +6265,15 @@
                                   </node>
                                   <node concept="HtI8k" id="4h2fJwlT33s" role="2OqNvi">
                                     <node concept="37vLTw" id="5yVrpGYDCs5" role="HtI8F">
-                                      <ref role="3cqZAo" node="5yVrpGYDC4D" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2i4" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5yVrpGYDC4D" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2i4" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5yVrpGYDC4E" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2i5" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -6480,7 +6481,7 @@
                   <node concept="3clFbF" id="4sAjwkKXbEp" role="3cqZAp">
                     <node concept="2OqwBi" id="4sAjwkUZd2F" role="3clFbG">
                       <node concept="37vLTw" id="4sAjwkUZcBI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4sAjwkKXbEv" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2i6" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4sAjwkUZhag" role="2OqNvi">
                         <ref role="37wK5l" node="4sAjwkUZeYA" resolve="isFailrueAware" />
@@ -6488,9 +6489,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4sAjwkKXbEv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2i6" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4sAjwkKXbEw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2i7" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6526,7 +6527,7 @@
                   <node concept="3clFbF" id="rICbQKJCXa" role="3cqZAp">
                     <node concept="2OqwBi" id="rICbQKJDlC" role="3clFbG">
                       <node concept="37vLTw" id="rICbQKJCX9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="rICbQKJCLt" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2i8" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="rICbQKJDYJ" role="2OqNvi">
                         <ref role="37wK5l" node="rICbQKEoTV" resolve="hasSubsequentStatementsToSkipOnFailure" />
@@ -6534,9 +6535,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="rICbQKJCLt" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2i8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="rICbQKJCLu" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2i9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6596,7 +6597,7 @@
                       <node concept="2OqwBi" id="4sAjwkRKVDV" role="3clFbG">
                         <node concept="2OqwBi" id="4sAjwkRKkbi" role="2Oq$k0">
                           <node concept="37vLTw" id="4sAjwkRKjJF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4sAjwkRKjvB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2ia" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="4sAjwkRKkMn" role="2OqNvi">
                             <node concept="1xMEDy" id="4sAjwkRKkMp" role="1xVPHs">
@@ -6613,9 +6614,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4sAjwkRKjvB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2ia" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4sAjwkRKjvC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2ib" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6686,7 +6687,7 @@
                     <node concept="3clFbF" id="4sAjwkRSsL3" role="3cqZAp">
                       <node concept="2OqwBi" id="4sAjwkTjAFI" role="3clFbG">
                         <node concept="37vLTw" id="4sAjwkTjAfG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4sAjwkRSsLx" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2ic" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="4sAjwkTjBRa" role="2OqNvi">
                           <ref role="37wK5l" node="4sAjwkSM8eC" resolve="isActive" />
@@ -6694,9 +6695,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4sAjwkRSsLx" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2ic" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4sAjwkRSsLy" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2id" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6884,7 +6885,7 @@
                         <ref role="3cqZAo" node="17MIiXb$_Dd" resolve="g" />
                       </node>
                       <node concept="37vLTw" id="5YZjOkvuwVh" role="37wK5m">
-                        <ref role="3cqZAo" node="6xkj9mMsJI" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ie" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="5YZjOkvyMrx" role="37wK5m">
                         <ref role="3cqZAo" node="17MIiXb$_Df" resolve="category" />
@@ -6892,9 +6893,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6xkj9mMsJI" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ie" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6xkj9mMsJJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2if" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/com.mbeddr.ext.statemachines.migration.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/com.mbeddr.ext.statemachines.migration.mps
index 60eee1ad86b..080d440ef84 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/com.mbeddr.ext.statemachines.migration.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/com.mbeddr.ext.statemachines.migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -55,7 +55,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -64,7 +64,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -76,6 +76,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -130,7 +131,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -144,7 +145,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="3SyAh_" id="19jNIE2aRp5">
@@ -200,7 +200,7 @@
                         <node concept="37vLTI" id="19jNIE2b8QT" role="3clFbG">
                           <node concept="2OqwBi" id="19jNIE2b8ys" role="37vLTJ">
                             <node concept="37vLTw" id="19jNIE2b8nL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="19jNIE2aZQO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2jk" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="19jNIE2b8Az" role="2OqNvi">
                               <ref role="3Tt5mk" to="clqz:5ak6HMA0ref" resolve="state" />
@@ -214,7 +214,7 @@
                                 <node concept="36biLy" id="19jNIE2b5vb" role="28nt2d">
                                   <node concept="2OqwBi" id="19jNIE2b5U1" role="36biLW">
                                     <node concept="37vLTw" id="19jNIE2b5Fw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="19jNIE2aZQO" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2jk" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="19jNIE2b68p" role="2OqNvi">
                                       <ref role="3Tt5mk" to="clqz:7XSydqoCt2" resolve="state_old" />
@@ -231,7 +231,7 @@
                           <node concept="10Nm6u" id="19jNIE2b9DW" role="37vLTx" />
                           <node concept="2OqwBi" id="19jNIE2b9bw" role="37vLTJ">
                             <node concept="37vLTw" id="19jNIE2b99m" role="2Oq$k0">
-                              <ref role="3cqZAo" node="19jNIE2aZQO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2jk" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="19jNIE2b9gk" role="2OqNvi">
                               <ref role="3Tt5mk" to="clqz:7XSydqoCt2" resolve="state_old" />
@@ -240,9 +240,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="19jNIE2aZQO" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2jk" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="19jNIE2aZQP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2jl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -267,7 +267,7 @@
                         <node concept="37vLTI" id="19jNIE2dFsG" role="3clFbG">
                           <node concept="2OqwBi" id="19jNIE2dFsH" role="37vLTJ">
                             <node concept="37vLTw" id="19jNIE2dFsI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="19jNIE2dFsX" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2jm" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="19jNIE2dMin" role="2OqNvi">
                               <ref role="3Tt5mk" to="clqz:19jNIE2ba9p" resolve="state" />
@@ -281,7 +281,7 @@
                                 <node concept="36biLy" id="19jNIE2dFsN" role="28nt2d">
                                   <node concept="2OqwBi" id="19jNIE2dFsO" role="36biLW">
                                     <node concept="37vLTw" id="19jNIE2dFsP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="19jNIE2dFsX" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2jm" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="19jNIE2dG6U" role="2OqNvi">
                                       <ref role="3Tt5mk" to="clqz:4ZnMRYVkPpO" resolve="state_old" />
@@ -298,7 +298,7 @@
                           <node concept="10Nm6u" id="19jNIE2dFsT" role="37vLTx" />
                           <node concept="2OqwBi" id="19jNIE2dFsU" role="37vLTJ">
                             <node concept="37vLTw" id="19jNIE2dFsV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="19jNIE2dFsX" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2jm" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="19jNIE2dGeP" role="2OqNvi">
                               <ref role="3Tt5mk" to="clqz:4ZnMRYVkPpO" resolve="state_old" />
@@ -307,9 +307,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="19jNIE2dFsX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2jm" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="19jNIE2dFsY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2jn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/constraints.mps
index 2aaf8d2c01e..9c89d55f9fe 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/constraints.mps
@@ -97,7 +97,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -148,6 +148,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -236,7 +237,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -262,7 +263,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -307,7 +307,7 @@
                       <node concept="3clFbF" id="5CkU_dHisEi" role="3cqZAp">
                         <node concept="1PxgMI" id="5CkU_dHisEj" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHisEk" role="1m5AlR">
-                            <ref role="3cqZAo" node="5CkU_dHisEm" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2ig" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="5CkU_dHisEl" role="3oSUPX">
                             <ref role="cht4Q" to="clqz:50Lk78xBr9L" resolve="Statemachine" />
@@ -315,9 +315,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHisEm" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ig" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHisEn" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2ih" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -527,7 +527,7 @@
                         <node concept="3fqX7Q" id="5yVrpGYvIdT" role="3clFbG">
                           <node concept="2OqwBi" id="5yVrpGYvIdV" role="3fr31v">
                             <node concept="37vLTw" id="5yVrpGYvIdW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5yVrpGYvGq1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ii" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5yVrpGYvIdX" role="2OqNvi">
                               <node concept="chp4Y" id="5yVrpGYvIdY" role="cj9EA">
@@ -538,9 +538,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5yVrpGYvGq1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ii" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5yVrpGYvGq2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2ij" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -616,7 +616,7 @@
                       <node concept="3clFbF" id="3TJMuIJYGDW" role="3cqZAp">
                         <node concept="2OqwBi" id="3TJMuIJYH57" role="3clFbG">
                           <node concept="37vLTw" id="3TJMuIJYGDV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3TJMuIJYG_5" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2ik" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="3TJMuIJYHDq" role="2OqNvi">
                             <ref role="37wK5l" to="ktif:3TJMuIJYFrK" resolve="canBeSent" />
@@ -624,9 +624,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3TJMuIJYG_5" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ik" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3TJMuIJYG_6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2il" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -692,7 +692,7 @@
                       <node concept="3clFbF" id="5CkU_dHisSs" role="3cqZAp">
                         <node concept="1PxgMI" id="5CkU_dHisSt" role="3clFbG">
                           <node concept="37vLTw" id="5CkU_dHisSu" role="1m5AlR">
-                            <ref role="3cqZAo" node="5CkU_dHisSw" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2im" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="5CkU_dHisSv" role="3oSUPX">
                             <ref role="cht4Q" to="x27k:5_l8w1EmTvt" resolve="FunctionSignature" />
@@ -700,9 +700,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHisSw" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2im" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHisSx" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2in" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -889,7 +889,7 @@
                             <node concept="2OqwBi" id="5CkU_dHisxV" role="3clFbG">
                               <node concept="2OqwBi" id="5CkU_dHisxW" role="2Oq$k0">
                                 <node concept="37vLTw" id="5CkU_dHisxX" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHisy0" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2io" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5CkU_dHisxY" role="2OqNvi">
                                   <ref role="3Tt5mk" to="clqz:3bLw7MCtNTe" resolve="trigger" />
@@ -901,9 +901,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5CkU_dHisy0" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2io" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5CkU_dHisy1" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2ip" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1222,7 +1222,7 @@
                             <node concept="2OqwBi" id="5CkU_dHisNK" role="3uHU7B">
                               <node concept="2OqwBi" id="5CkU_dHisNL" role="2Oq$k0">
                                 <node concept="37vLTw" id="5CkU_dHisNM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHisNU" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2iq" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5CkU_dHisNN" role="2OqNvi">
                                   <ref role="3Tt5mk" to="clqz:4CnBdUFyZT4" resolve="trigger" />
@@ -1236,7 +1236,7 @@
                           <node concept="3clFbC" id="5CkU_dHisNP" role="3uHU7B">
                             <node concept="2OqwBi" id="5CkU_dHisNQ" role="3uHU7B">
                               <node concept="37vLTw" id="5CkU_dHisNR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5CkU_dHisNU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2iq" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5CkU_dHisNS" role="2OqNvi">
                                 <ref role="3Tt5mk" to="clqz:4CnBdUFyZT4" resolve="trigger" />
@@ -1247,9 +1247,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5CkU_dHisNU" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2iq" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5CkU_dHisNV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2ir" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1427,7 +1427,7 @@
                             <node concept="3clFbF" id="5CkU_dHit0u" role="3cqZAp">
                               <node concept="2OqwBi" id="5CkU_dHit0v" role="3clFbG">
                                 <node concept="37vLTw" id="5CkU_dHit0w" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5CkU_dHit0y" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2is" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5CkU_dHit0x" role="2OqNvi">
                                   <ref role="37wK5l" to="ktif:13QNHYGEUZl" resolve="visibleExternally" />
@@ -1435,9 +1435,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5CkU_dHit0y" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2is" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5CkU_dHit0z" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2it" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1696,7 +1696,7 @@
                       <node concept="3clFbF" id="6FqI49E1PJS" role="3cqZAp">
                         <node concept="17QLQc" id="6FqI49E1RcK" role="3clFbG">
                           <node concept="37vLTw" id="6FqI49E1Rvv" role="3uHU7w">
-                            <ref role="3cqZAo" node="6FqI49E1PBV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2iu" resolve="it" />
                           </node>
                           <node concept="2OqwBi" id="6FqI49E1Qf2" role="3uHU7B">
                             <node concept="EsrRn" id="6FqI49E1PJR" role="2Oq$k0" />
@@ -1705,9 +1705,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6FqI49E1PBV" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2iu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6FqI49E1PBW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2iv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1719,7 +1719,7 @@
                       <node concept="17QLQc" id="5cuzu6RIhDu" role="3clFbG">
                         <node concept="2OqwBi" id="5cuzu6RIigZ" role="3uHU7w">
                           <node concept="37vLTw" id="5cuzu6RIBmS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5cuzu6RIAPi" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2iw" resolve="it" />
                           </node>
                           <node concept="3n3YKJ" id="5cuzu6RIiHY" role="2OqNvi" />
                         </node>
@@ -1727,9 +1727,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5cuzu6RIAPi" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2iw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5cuzu6RIAPj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2ix" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/dataFlow.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/dataFlow.mps
index 19d771b540b..38bd65b26cc 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/dataFlow.mps
@@ -112,7 +112,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -132,6 +132,7 @@
       <concept id="1649655856141352250" name="jetbrains.mps.lang.pattern.structure.InsertBeforePosition" flags="ng" index="3s5BLS" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -215,7 +216,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -242,7 +243,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -747,7 +747,7 @@
                         <node concept="3clFbF" id="6lCup2QwZsf" role="3cqZAp">
                           <node concept="2OqwBi" id="6lCup2QwZsg" role="3clFbG">
                             <node concept="37vLTw" id="6lCup2QwZsh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6lCup2QwZsj" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2iy" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6lCup2QwZsi" role="2OqNvi">
                               <ref role="3TsBF5" to="clqz:3TE6JCmc0ex" resolve="writable" />
@@ -755,9 +755,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6lCup2QwZsj" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2iy" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6lCup2QwZsk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2iz" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
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 0b08a143dff..2afe9b0573e 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
@@ -436,6 +436,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -739,7 +740,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -1254,7 +1254,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="7Dny5nF_pg4" role="3uHU7w">
                                   <node concept="37vLTw" id="7Dny5nF_pfJ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7Dny5nF_pfh" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2i$" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="7Dny5nF_pqP" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1267,9 +1267,9 @@
                             <property role="TrG5h" value="s" />
                             <node concept="17QB3L" id="7Dny5nF_pfl" role="1tU5fm" />
                           </node>
-                          <node concept="Rh6nW" id="7Dny5nF_pfh" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2i$" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7Dny5nF_pfi" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2i_" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="7Dny5nF_pfk" role="1MDeny">
@@ -1329,7 +1329,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="7Dny5nF_pry" role="3uHU7w">
                                     <node concept="37vLTw" id="7Dny5nF_prz" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7Dny5nF_prC" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2iA" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="7Dny5nF_pr$" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1343,9 +1343,9 @@
                             <property role="TrG5h" value="s" />
                             <node concept="17QB3L" id="7Dny5nF_prB" role="1tU5fm" />
                           </node>
-                          <node concept="Rh6nW" id="7Dny5nF_prC" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2iA" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7Dny5nF_prD" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2iB" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="7Dny5nF_prE" role="1MDeny">
@@ -2621,7 +2621,7 @@
                                 <node concept="2OqwBi" id="kJtP4G75$S" role="3uHU7B">
                                   <node concept="2OqwBi" id="kJtP4G6G_c" role="2Oq$k0">
                                     <node concept="37vLTw" id="kJtP4G6DJ4" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="kJtP4G4kfI" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2iC" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="kJtP4G6Rc8" role="2OqNvi">
                                       <ref role="3Tt5mk" to="clqz:3bLw7MCtNTe" resolve="trigger" />
@@ -2635,7 +2635,7 @@
                               <node concept="3clFbC" id="kJtP4G6Aa_" role="3uHU7B">
                                 <node concept="2OqwBi" id="kJtP4G4nqB" role="3uHU7B">
                                   <node concept="37vLTw" id="kJtP4G4lga" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="kJtP4G4kfI" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2iC" resolve="it" />
                                   </node>
                                   <node concept="1mfA1w" id="kJtP4G4xYU" role="2OqNvi" />
                                 </node>
@@ -2646,9 +2646,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="kJtP4G4kfI" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2iC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="kJtP4G4kfJ" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2iD" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3090,7 +3090,7 @@
                                     <node concept="2OqwBi" id="fcvYn4XOAn" role="3uHU7B">
                                       <node concept="2OqwBi" id="fcvYn4X_h6" role="2Oq$k0">
                                         <node concept="37vLTw" id="fcvYn4XzjX" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="fcvYn4XyMy" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2iE" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="fcvYn4XJ7p" role="2OqNvi">
                                           <ref role="3Tt5mk" to="clqz:3bLw7MCtNTe" resolve="trigger" />
@@ -3103,9 +3103,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="fcvYn4XyMy" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2iE" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="fcvYn4XyMz" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2iF" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3116,15 +3116,15 @@
                               <node concept="3clFbF" id="6Jye7exN9X0" role="3cqZAp">
                                 <node concept="2OqwBi" id="6Jye7exNe50" role="3clFbG">
                                   <node concept="37vLTw" id="6Jye7exN9WZ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6Jye7exN9bq" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2iG" resolve="it" />
                                   </node>
                                   <node concept="3YRAZt" id="6Jye7exNuah" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6Jye7exN9bq" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2iG" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6Jye7exN9br" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2iH" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -4692,7 +4692,7 @@
                             <node concept="3clFbF" id="3$Bjl9PR$5P" role="3cqZAp">
                               <node concept="2OqwBi" id="3$Bjl9PR$5Q" role="3clFbG">
                                 <node concept="37vLTw" id="3$Bjl9PR$5R" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3$Bjl9PR$5U" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2iI" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="3$Bjl9PR$5S" role="2OqNvi">
                                   <node concept="chp4Y" id="3$Bjl9PR$5T" role="cj9EA">
@@ -4702,9 +4702,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3$Bjl9PR$5U" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2iI" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3$Bjl9PR$5V" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2iJ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4879,7 +4879,7 @@
                           <node concept="1Pxb5l" id="4UHO8tvHAu1" role="3uHU7w" />
                           <node concept="2OqwBi" id="4UHO8tvHAu2" role="3uHU7B">
                             <node concept="37vLTw" id="4UHO8tvHAu3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4UHO8tvHAu5" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2iK" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4UHO8tvHAu4" role="2OqNvi">
                               <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -4888,9 +4888,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4UHO8tvHAu5" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2iK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4UHO8tvHAu6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2iL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4901,15 +4901,15 @@
                     <node concept="3clFbF" id="4UHO8tvHAua" role="3cqZAp">
                       <node concept="2OqwBi" id="4UHO8tvHAub" role="3clFbG">
                         <node concept="37vLTw" id="4UHO8tvHAuc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4UHO8tvHAue" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2iM" resolve="it" />
                         </node>
                         <node concept="3YRAZt" id="4UHO8tvHAud" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4UHO8tvHAue" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2iM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4UHO8tvHAuf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2iN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5253,7 +5253,7 @@
                       <node concept="3clFbF" id="7$cwLzjsA7c" role="3cqZAp">
                         <node concept="2OqwBi" id="7$cwLzjsA7d" role="3clFbG">
                           <node concept="37vLTw" id="7$cwLzjsA7e" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7$cwLzjsA7h" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2iO" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="7$cwLzjsA7f" role="2OqNvi">
                             <node concept="chp4Y" id="7$cwLzjsA7g" role="cj9EA">
@@ -5263,9 +5263,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7$cwLzjsA7h" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2iO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7$cwLzjsA7i" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2iP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5760,7 +5760,7 @@
                             <node concept="1Pxb5l" id="4UHO8tvDL9F" role="3uHU7w" />
                             <node concept="2OqwBi" id="4UHO8tvDJ3o" role="3uHU7B">
                               <node concept="37vLTw" id="4UHO8tvDIVx" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4UHO8tvDIPZ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2iQ" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="4UHO8tvDKdq" role="2OqNvi">
                                 <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -5769,9 +5769,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4UHO8tvDIPZ" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2iQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4UHO8tvDIQ0" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2iR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5782,15 +5782,15 @@
                       <node concept="3clFbF" id="4UHO8tvDNod" role="3cqZAp">
                         <node concept="2OqwBi" id="4UHO8tvDNx$" role="3clFbG">
                           <node concept="37vLTw" id="4UHO8tvDNoc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4UHO8tvDN7L" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2iS" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="4UHO8tvDONp" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4UHO8tvDN7L" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2iS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4UHO8tvDN7M" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2iT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/intentions.mps
index d6701290ea7..8fb60e7e95b 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/intentions.mps
@@ -107,7 +107,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,6 +124,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -222,7 +223,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -254,7 +255,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -878,7 +878,7 @@
                         <node concept="2Sf5sV" id="5xmXWf3dFT0" role="3uHU7w" />
                         <node concept="2OqwBi" id="5xmXWf3dFT1" role="3uHU7B">
                           <node concept="37vLTw" id="5xmXWf3dFT2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5xmXWf3dFT4" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2iU" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5xmXWf3dFT3" role="2OqNvi">
                             <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -887,9 +887,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5xmXWf3dFT4" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2iU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5xmXWf3dFT5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2iV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -974,7 +974,7 @@
                       </node>
                       <node concept="2OqwBi" id="5xmXWf3dFX_" role="37vLTJ">
                         <node concept="37vLTw" id="5xmXWf3dFX6" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5xmXWf3dFX3" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2iW" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5xmXWf3dFXF" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -983,9 +983,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5xmXWf3dFX3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2iW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5xmXWf3dFX4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2iX" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1606,7 +1606,7 @@
                         <node concept="2Sf5sV" id="5xmXWf3e7Qa" role="3uHU7w" />
                         <node concept="2OqwBi" id="5xmXWf3e7Qb" role="3uHU7B">
                           <node concept="37vLTw" id="5xmXWf3e7Qc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5xmXWf3e7Qe" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2iY" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5xmXWf3e7Qd" role="2OqNvi">
                             <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -1615,9 +1615,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5xmXWf3e7Qe" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2iY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5xmXWf3e7Qf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2iZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1729,7 +1729,7 @@
                       </node>
                       <node concept="2OqwBi" id="5xmXWf3e7QP" role="37vLTJ">
                         <node concept="37vLTw" id="5xmXWf3e7QQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5xmXWf3e7QS" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2j0" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5xmXWf3e7QR" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:16ykm_MbSnY" resolve="targetState" />
@@ -1738,9 +1738,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5xmXWf3e7QS" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2j0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5xmXWf3e7QT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2j1" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/plugin.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/plugin.mps
index 910c31dbf73..d9bb9c4399d 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:28395f16-bca2-4bbe-b124-41d67af318af(com.mbeddr.ext.statemachines.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/refactorings.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/refactorings.mps
index 39a48fc2c08..a83fb6b54b7 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/refactorings.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/refactorings.mps
@@ -60,7 +60,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -135,7 +135,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/scripts.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/scripts.mps
index ee508f23827..5bbdbbd0af0 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/scripts.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/scripts.mps
@@ -81,6 +81,7 @@
       <concept id="1177458491964" name="jetbrains.mps.lang.script.structure.MigrationScriptPart_Instance_Updater" flags="in" index="_ZGcI" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -111,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -125,7 +126,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -196,7 +196,7 @@
                       <node concept="3clFbF" id="5ngFs$3Tev5" role="3cqZAp">
                         <node concept="2OqwBi" id="5ngFs$3Tev6" role="3clFbG">
                           <node concept="37vLTw" id="5ngFs$3Tev7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5ngFs$3Teva" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2j2" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5ngFs$3Tev8" role="2OqNvi">
                             <node concept="chp4Y" id="5ngFs$3Tev9" role="cj9EA">
@@ -206,9 +206,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5ngFs$3Teva" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2j2" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5ngFs$3Tevb" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2j3" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -329,7 +329,7 @@
                           <node concept="3clFbF" id="5ngFs$3TpEn" role="3cqZAp">
                             <node concept="2OqwBi" id="5ngFs$3TpEo" role="3clFbG">
                               <node concept="37vLTw" id="5ngFs$3TpEp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5ngFs$3TpEs" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2j4" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="5ngFs$3TpEq" role="2OqNvi">
                                 <node concept="chp4Y" id="5ngFs$3TpEr" role="cj9EA">
@@ -339,9 +339,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5ngFs$3TpEs" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2j4" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5ngFs$3TpEt" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2j5" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/typesystem.mps
index fc4504b2826..ff332f3700d 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/typesystem.mps
@@ -93,7 +93,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,6 +116,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -302,7 +303,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -337,7 +338,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -889,7 +889,7 @@
                     <node concept="2OqwBi" id="7EEuXpJqnRf" role="3uHU7w">
                       <node concept="2OqwBi" id="7EEuXpJqmIB" role="2Oq$k0">
                         <node concept="37vLTw" id="7EEuXpJqmkF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7EEuXpJqjTU" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2j6" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7EEuXpJqnn5" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:7EEuXpIA8et" resolve="failureHandler" />
@@ -900,7 +900,7 @@
                     <node concept="17R0WA" id="7EEuXpJqlsP" role="3uHU7B">
                       <node concept="2OqwBi" id="7EEuXpJqkkt" role="3uHU7B">
                         <node concept="37vLTw" id="7EEuXpJqjXA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7EEuXpJqjTU" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2j6" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7EEuXpJqkU5" role="2OqNvi">
                           <ref role="3Tt5mk" to="clqz:7BISmlsIlB1" resolve="event" />
@@ -913,9 +913,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="7EEuXpJqjTU" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2j6" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="7EEuXpJqjTV" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2j7" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1192,7 +1192,7 @@
                         <node concept="2OqwBi" id="79i$vAY7bgj" role="2Oq$k0">
                           <node concept="2yIwOk" id="79i$vAY7bgk" role="2OqNvi" />
                           <node concept="37vLTw" id="1nOZGI8BYH6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1nOZGI8BYH3" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2j8" resolve="it" />
                           </node>
                         </node>
                         <node concept="3O6GUB" id="79i$vAY7bgl" role="2OqNvi">
@@ -1204,9 +1204,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1nOZGI8BYH3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2j8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1nOZGI8BYH4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2j9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1417,7 +1417,7 @@
                   <node concept="3clFbF" id="3TCD4YF2FRm" role="3cqZAp">
                     <node concept="2OqwBi" id="3TCD4YF2GaL" role="3clFbG">
                       <node concept="37vLTw" id="3TCD4YF2FRl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3TCD4YF2FJX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ja" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="3TCD4YF2Gwm" role="2OqNvi">
                         <node concept="chp4Y" id="3TCD4YF2GIp" role="cj9EA">
@@ -1427,9 +1427,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3TCD4YF2FJX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ja" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3TCD4YF2FJY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2jb" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1772,7 +1772,7 @@
                   <node concept="3clFbF" id="47Sr75PnVmB" role="3cqZAp">
                     <node concept="2OqwBi" id="47Sr75PnVmC" role="3clFbG">
                       <node concept="37vLTw" id="47Sr75PnVmD" role="2Oq$k0">
-                        <ref role="3cqZAo" node="47Sr75PnVmG" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2jc" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="47Sr75PnVmE" role="2OqNvi">
                         <node concept="chp4Y" id="47Sr75PnVmF" role="cj9EA">
@@ -1782,9 +1782,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="47Sr75PnVmG" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2jc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="47Sr75PnVmH" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2jd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1847,7 +1847,7 @@
                   <node concept="3clFbF" id="47Sr75PnVnO" role="3cqZAp">
                     <node concept="2OqwBi" id="47Sr75PnVnP" role="3clFbG">
                       <node concept="37vLTw" id="47Sr75PnVnQ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="47Sr75PnVnT" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2je" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="47Sr75PnVnR" role="2OqNvi">
                         <node concept="chp4Y" id="47Sr75PnVnV" role="cj9EA">
@@ -1857,9 +1857,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="47Sr75PnVnT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2je" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="47Sr75PnVnU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2jf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2087,7 +2087,7 @@
                           <node concept="3clFbF" id="4sAjwkThr4I" role="3cqZAp">
                             <node concept="2OqwBi" id="4sAjwkThr_8" role="3clFbG">
                               <node concept="37vLTw" id="4sAjwkThr4H" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4sAjwkThqUy" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2jg" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="4sAjwkTjFXV" role="2OqNvi">
                                 <ref role="37wK5l" to="ktif:4sAjwkTiqeO" resolve="getTargetAndFailureStates" />
@@ -2095,9 +2095,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4sAjwkThqUy" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2jg" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4sAjwkThqUz" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2jh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2111,14 +2111,14 @@
                               <ref role="1YBMHb" node="7rX8gRKHIeW" resolve="s" />
                             </node>
                             <node concept="37vLTw" id="7rX8gRKHIp$" role="3uHU7B">
-                              <ref role="3cqZAo" node="7rX8gRKHIpx" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ji" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7rX8gRKHIpx" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ji" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7rX8gRKHIpy" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2jj" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd
index 4d9b5aa76a8..440b675f673 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.statemachines.pluginSolution" uuid="32daa3c3-184a-4af4-96bb-ac5965c458ed" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.ext.statemachines.pluginSolution" uuid="32daa3c3-184a-4af4-96bb-ac5965c458ed" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)</dependency>
     <dependency reexport="false">564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines)</dependency>
@@ -21,7 +20,7 @@
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
@@ -75,7 +74,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/models/com/mbeddr/ext/statemachines/pluginSolution/plugin.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/models/com/mbeddr/ext/statemachines/pluginSolution/plugin.mps
index 0e7cb85ce60..a4b195064c4 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/models/com/mbeddr/ext/statemachines/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/models/com/mbeddr/ext/statemachines/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
   </languages>
   <imports>
@@ -27,7 +27,7 @@
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 cdef49bdade..0028ec8512f 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
@@ -56,7 +56,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -155,7 +155,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -191,7 +190,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -212,7 +211,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl
index 12f197ed192..bc860750769 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl
@@ -46,7 +46,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -108,7 +108,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -128,7 +127,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -169,7 +167,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -193,7 +191,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -260,7 +258,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
   </dependencyVersions>
   <runtime>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/generator/template/main@generator.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/generator/template/main@generator.mps
index fe8dae911f3..5ea8846c187 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/generator/template/main@generator.mps
@@ -63,7 +63,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -160,7 +160,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -230,7 +230,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -245,7 +245,7 @@
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageAccessories/com/mbeddr/ext/units/siunits.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageAccessories/com/mbeddr/ext/units/siunits.mps
index 4f7c5f8a1d9..0b6af3f48ec 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageAccessories/com/mbeddr/ext/units/siunits.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageAccessories/com/mbeddr/ext/units/siunits.mps
@@ -29,12 +29,12 @@
       <concept id="6111466015651074424" name="com.mbeddr.ext.units.structure.EmptyUnitContainerContent" flags="ng" index="134lye" />
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/behavior.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/behavior.mps
index 74b60e65452..cadb52ec541 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/behavior.mps
@@ -198,6 +198,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -367,7 +368,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -2499,7 +2499,7 @@
                       <node concept="3fqX7Q" id="2Jcs$lvbx_k" role="3uHU7w">
                         <node concept="2OqwBi" id="2Jcs$lvbx_l" role="3fr31v">
                           <node concept="37vLTw" id="2Jcs$lvbx_m" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2Jcs$lvbx_u" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2ks" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="2Jcs$lvbx_n" role="2OqNvi">
                             <node concept="chp4Y" id="2Jcs$lvbx_o" role="cj9EA">
@@ -2511,7 +2511,7 @@
                       <node concept="3fqX7Q" id="2Jcs$lvbx_p" role="3uHU7B">
                         <node concept="2OqwBi" id="2Jcs$lvbx_q" role="3fr31v">
                           <node concept="37vLTw" id="2Jcs$lvbx_r" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2Jcs$lvbx_u" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2ks" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="2Jcs$lvbx_s" role="2OqNvi">
                             <node concept="chp4Y" id="2Jcs$lvbx_t" role="cj9EA">
@@ -2523,9 +2523,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2Jcs$lvbx_u" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ks" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2Jcs$lvbx_v" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2kt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2564,7 +2564,7 @@
                   <node concept="3clFbF" id="2Jcs$lvbxKd" role="3cqZAp">
                     <node concept="2OqwBi" id="2Jcs$lvbxKe" role="3clFbG">
                       <node concept="37vLTw" id="2Jcs$lvbxKf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2Jcs$lvbxKh" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ku" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="2Jcs$lvbxKg" role="2OqNvi">
                         <ref role="37wK5l" node="2Jcs$lvbshN" resolve="isExported" />
@@ -2572,9 +2572,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2Jcs$lvbxKh" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ku" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2Jcs$lvbxKi" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2kv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2687,7 +2687,7 @@
                     <node concept="3clFbF" id="3VpMwkck1zK" role="3cqZAp">
                       <node concept="2OqwBi" id="3VpMwkck1DC" role="3clFbG">
                         <node concept="37vLTw" id="3VpMwkck1zJ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3VpMwkck1nu" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kw" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="3VpMwkck26c" role="2OqNvi">
                           <node concept="chp4Y" id="3VpMwkck442" role="cj9EA">
@@ -2697,9 +2697,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3VpMwkck1nu" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2kw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3VpMwkck1nv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2710,7 +2710,7 @@
                   <node concept="3clFbF" id="3VpMwkck8Bh" role="3cqZAp">
                     <node concept="1PxgMI" id="3VpMwkck8KF" role="3clFbG">
                       <node concept="37vLTw" id="3VpMwkck8Bg" role="1m5AlR">
-                        <ref role="3cqZAo" node="3VpMwkck8r5" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ky" resolve="it" />
                       </node>
                       <node concept="chp4Y" id="79i$vAY7bG0" role="3oSUPX">
                         <ref role="cht4Q" to="qlb5:7eOyx9r3jsZ" resolve="Unit" />
@@ -2718,9 +2718,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3VpMwkck8r5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ky" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3VpMwkck8r6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2kz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2755,7 +2755,7 @@
                     <node concept="2OqwBi" id="5OrPku_S2az" role="3clFbG">
                       <node concept="2OqwBi" id="5OrPku_S2a$" role="2Oq$k0">
                         <node concept="37vLTw" id="5OrPku_S2a_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5OrPku_S2aD" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2k$" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="5OrPku_S2aA" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2770,9 +2770,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5OrPku_S2aD" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2k$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5OrPku_S2aE" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2k_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3398,7 +3398,7 @@
                   <node concept="3clFbF" id="7UgeC20_Fvo" role="3cqZAp">
                     <node concept="2OqwBi" id="7UgeC20_Fvp" role="3clFbG">
                       <node concept="37vLTw" id="7UgeC20_Fvq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7UgeC20_Fvv" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2kA" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="7UgeC20_Fvr" role="2OqNvi">
                         <node concept="2OqwBi" id="7UgeC20_Fvs" role="1P9ThW">
@@ -3411,9 +3411,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7UgeC20_Fvv" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2kA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7UgeC20_Fvw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2kB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4457,7 +4457,7 @@
                                         <node concept="10Nm6u" id="3LCGbux9rKa" role="3uHU7w" />
                                         <node concept="2OqwBi" id="3LCGbux9rKb" role="3uHU7B">
                                           <node concept="37vLTw" id="3LCGbux9rKc" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3LCGbux9rKl" resolve="mapping" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2kC" resolve="mapping" />
                                           </node>
                                           <node concept="3TrEf2" id="49YGTZemcAh" role="2OqNvi">
                                             <ref role="3Tt5mk" to="qlb5:5W7baqyQp3N" resolve="specification" />
@@ -4467,7 +4467,7 @@
                                       <node concept="3clFbC" id="3LCGbux9rKe" role="3uHU7B">
                                         <node concept="2OqwBi" id="3LCGbux9rKf" role="3uHU7B">
                                           <node concept="37vLTw" id="3LCGbux9rKg" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3LCGbux9rKl" resolve="mapping" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2kC" resolve="mapping" />
                                           </node>
                                           <node concept="3TrEf2" id="49YGTZemah$" role="2OqNvi">
                                             <ref role="3Tt5mk" to="qlb5:5W7baqyQp5n" resolve="metaUnit" />
@@ -4485,9 +4485,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3LCGbux9rKl" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2kC" role="1bW2Oz">
                                   <property role="TrG5h" value="mapping" />
-                                  <node concept="2jxLKc" id="3LCGbux9rKm" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2kD" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -4664,7 +4664,7 @@
                       <node concept="2OqwBi" id="6VYXZgG9vBw" role="3clFbG">
                         <node concept="2OqwBi" id="6VYXZgG9uT1" role="2Oq$k0">
                           <node concept="37vLTw" id="6VYXZgG9uN$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6VYXZgG9uC7" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2kE" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6VYXZgG9vfA" role="2OqNvi">
                             <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -4678,9 +4678,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6VYXZgG9uC7" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2kE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6VYXZgG9uC8" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/constraints.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/constraints.mps
index 63b561dadbe..520c8ca1e4d 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/constraints.mps
@@ -53,7 +53,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/editor.mps
index f89e39c0516..300fad531a3 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/editor.mps
@@ -121,15 +121,15 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -159,14 +159,14 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="7597241200646296619" name="jetbrains.mps.lang.editor.structure.QueryFunction_SNode" flags="in" index="3k4GqP" />
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3308396621974588243" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_Contribution" flags="ng" index="3p309x">
@@ -199,7 +199,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -207,7 +207,7 @@
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -225,7 +225,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -335,7 +335,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -474,7 +474,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/intentions.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/intentions.mps
index 01b759f8312..0e67bd377d2 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/intentions.mps
@@ -78,7 +78,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -191,7 +191,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/migration.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/migration.mps
index 137f9a19905..a2a995f065f 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -30,7 +30,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -52,7 +52,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/plugin.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/plugin.mps
index 297bb1e9ec4..1f6f65502fc 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:778c8df8-cfda-4db9-bf16-a0f1d0708430(com.mbeddr.ext.units.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/structure.mps
index 0b325969d68..f3280e9ad88 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/structure.mps
@@ -64,7 +64,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/typesystem.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/typesystem.mps
index 007c0c50b3e..6a397d4e43e 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/languageModels/typesystem.mps
@@ -50,7 +50,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -146,7 +146,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -165,7 +165,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -187,6 +187,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -403,7 +404,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -453,7 +454,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -2209,7 +2209,7 @@
                     <node concept="3clFbF" id="37qHMK0m3FQ" role="3cqZAp">
                       <node concept="2OqwBi" id="37qHMK0m3Qv" role="3clFbG">
                         <node concept="37vLTw" id="37qHMK0m3FP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="37qHMK0m3l8" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kG" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="37qHMK0m4ZH" role="2OqNvi">
                           <node concept="chp4Y" id="37qHMK0m5nP" role="cj9EA">
@@ -2219,9 +2219,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="37qHMK0m3l8" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2kG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="37qHMK0m3l9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2631,7 +2631,7 @@
                     <node concept="3clFbF" id="1UsZwgYADEU" role="3cqZAp">
                       <node concept="2OqwBi" id="1UsZwgYADPF" role="3clFbG">
                         <node concept="37vLTw" id="1UsZwgYADET" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1UsZwgYADhX" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kI" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="1UsZwgYAENK" role="2OqNvi">
                           <node concept="chp4Y" id="1UsZwgYAFdq" role="cj9EA">
@@ -2641,9 +2641,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1UsZwgYADhX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2kI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1UsZwgYADhY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2966,7 +2966,7 @@
                                             <node concept="2OqwBi" id="AeX2DksuXg" role="3clFbG">
                                               <node concept="2OqwBi" id="AeX2Dksukj" role="2Oq$k0">
                                                 <node concept="37vLTw" id="AeX2DksugH" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="AeX2Dksubo" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2kK" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="AeX2DksuF8" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -2980,9 +2980,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="AeX2Dksubo" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN2kK" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="AeX2Dksubp" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN2kL" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -3394,7 +3394,7 @@
                                         <node concept="2OqwBi" id="AeX2DkqSKe" role="3uHU7B">
                                           <node concept="2OqwBi" id="AeX2DkqS8s" role="2Oq$k0">
                                             <node concept="37vLTw" id="AeX2DkqS45" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="AeX2DkqRSN" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2kM" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="AeX2DkqSyt" role="2OqNvi">
                                               <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -3416,7 +3416,7 @@
                                                 <node concept="2OqwBi" id="Kov5PvPeHG" role="3uHU7B">
                                                   <node concept="2OqwBi" id="Kov5PvPeHH" role="2Oq$k0">
                                                     <node concept="37vLTw" id="Kov5PvPeHI" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="AeX2DkqRSN" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2kM" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="Kov5PvPeHJ" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFY" resolve="exponent" />
@@ -3430,7 +3430,7 @@
                                               <node concept="3y3z36" id="Kov5PvPeHL" role="3uHU7B">
                                                 <node concept="2OqwBi" id="Kov5PvPeHM" role="3uHU7B">
                                                   <node concept="37vLTw" id="Kov5PvPeHN" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="AeX2DkqRSN" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2kM" resolve="it" />
                                                   </node>
                                                   <node concept="3TrEf2" id="Kov5PvPeHO" role="2OqNvi">
                                                     <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFY" resolve="exponent" />
@@ -3444,9 +3444,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="AeX2DkqRSN" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2kM" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="AeX2DkqRSO" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2kN" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -3914,7 +3914,7 @@
                                                 <node concept="2OqwBi" id="5dSoB2M2h60" role="3clFbG">
                                                   <node concept="2OqwBi" id="2XknsxclUHZ" role="2Oq$k0">
                                                     <node concept="37vLTw" id="2XknsxclUCF" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="2XknsxclUzg" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2kO" resolve="it" />
                                                     </node>
                                                     <node concept="3AV6Ez" id="2XknsxclVcI" role="2OqNvi" />
                                                   </node>
@@ -3924,9 +3924,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="2XknsxclUzg" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN2kO" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="2XknsxclUzh" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN2kP" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -4694,7 +4694,7 @@
                           <node concept="2OqwBi" id="2Xknsxcxigs" role="3clFbG">
                             <node concept="2OqwBi" id="2XknsxcxhFk" role="2Oq$k0">
                               <node concept="37vLTw" id="2XknsxcxhCg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2Xknsxcxh$r" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2kQ" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2Xknsxcxi1f" role="2OqNvi">
                                 <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -4708,9 +4708,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2Xknsxcxh$r" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2kQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2Xknsxcxh$s" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2kR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5020,7 +5020,7 @@
                     <node concept="3clFbF" id="6hWxniPzPYs" role="3cqZAp">
                       <node concept="2OqwBi" id="6hWxniPzPYt" role="3clFbG">
                         <node concept="37vLTw" id="6hWxniPzPYu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hWxniPzPYx" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kS" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="6hWxniPzPYv" role="2OqNvi">
                           <node concept="chp4Y" id="6hWxniPzPYw" role="cj9EA">
@@ -5030,9 +5030,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hWxniPzPYx" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2kS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hWxniPzPYy" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5058,7 +5058,7 @@
                     <node concept="3clFbF" id="6hWxniPzTKr" role="3cqZAp">
                       <node concept="2OqwBi" id="6hWxniPzTKs" role="3clFbG">
                         <node concept="37vLTw" id="6hWxniPzTKt" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6hWxniPzTKw" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kU" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="6hWxniPzTKu" role="2OqNvi">
                           <node concept="chp4Y" id="6hWxniPzTKv" role="cj9EA">
@@ -5068,9 +5068,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hWxniPzTKw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2kU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hWxniPzTKx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5463,7 +5463,7 @@
                   <node concept="3clFbF" id="1UsZwgYBv4v" role="3cqZAp">
                     <node concept="2OqwBi" id="1UsZwgYBvgZ" role="3clFbG">
                       <node concept="37vLTw" id="1UsZwgYBv4u" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1UsZwgYBuAQ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2kW" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="1UsZwgYBxTV" role="2OqNvi">
                         <node concept="chp4Y" id="1UsZwgYByoh" role="cj9EA">
@@ -5473,9 +5473,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1UsZwgYBuAQ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2kW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1UsZwgYBuAR" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2kX" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6013,7 +6013,7 @@
                     <node concept="3clFbF" id="37qHMK0m62y" role="3cqZAp">
                       <node concept="2OqwBi" id="37qHMK0m62z" role="3clFbG">
                         <node concept="37vLTw" id="37qHMK0m62$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="37qHMK0m62B" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2kY" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="37qHMK0m62_" role="2OqNvi">
                           <node concept="chp4Y" id="37qHMK0m62A" role="cj9EA">
@@ -6023,9 +6023,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="37qHMK0m62B" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2kY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="37qHMK0m62C" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2kZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6156,7 +6156,7 @@
                     <node concept="3clFbF" id="37qHMK0m6Ms" role="3cqZAp">
                       <node concept="2OqwBi" id="37qHMK0m6Mt" role="3clFbG">
                         <node concept="37vLTw" id="37qHMK0m6Mu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="37qHMK0m6Mx" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2l0" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="37qHMK0m6Mv" role="2OqNvi">
                           <node concept="chp4Y" id="37qHMK0m6Mw" role="cj9EA">
@@ -6166,9 +6166,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="37qHMK0m6Mx" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2l0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="37qHMK0m6My" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2l1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9127,7 +9127,7 @@
                                 <node concept="2OqwBi" id="2RQ3CseQ3U_" role="3clFbG">
                                   <node concept="2OqwBi" id="2RQ3CseQ35I" role="2Oq$k0">
                                     <node concept="37vLTw" id="2RQ3CseQ307" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2RQ3CseQ2Rf" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2l2" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="2RQ3CseQ3$n" role="2OqNvi">
                                       <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -9141,9 +9141,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2RQ3CseQ2Rf" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2l2" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2RQ3CseQ2Rg" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2l3" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -9155,7 +9155,7 @@
                               <node concept="1PxgMI" id="2RQ3CseQ7MO" role="3clFbG">
                                 <node concept="2OqwBi" id="2RQ3CseQ6$d" role="1m5AlR">
                                   <node concept="37vLTw" id="2RQ3CseQ6t9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2RQ3CseQ6k9" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2l4" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2RQ3CseQ7jd" role="2OqNvi">
                                     <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -9167,9 +9167,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2RQ3CseQ6k9" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2l4" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2RQ3CseQ6ka" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2l5" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -9275,7 +9275,7 @@
                                         <node concept="2OqwBi" id="2RQ3CseQ_kY" role="3clFbG">
                                           <node concept="2OqwBi" id="2RQ3CseQz6_" role="2Oq$k0">
                                             <node concept="37vLTw" id="2RQ3CseQysn" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2RQ3CseQxlT" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2l6" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="2RQ3CseQ$Pu" role="2OqNvi">
                                               <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -9289,9 +9289,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="2RQ3CseQxlT" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2l6" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="2RQ3CseQxlU" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2l7" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -9303,7 +9303,7 @@
                                       <node concept="1PxgMI" id="2RQ3CseQLyY" role="3clFbG">
                                         <node concept="2OqwBi" id="2RQ3CseQIN$" role="1m5AlR">
                                           <node concept="37vLTw" id="2RQ3CseQIDH" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2RQ3CseQGN9" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2l8" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="2RQ3CseQKz6" role="2OqNvi">
                                             <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -9315,9 +9315,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="2RQ3CseQGN9" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2l8" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="2RQ3CseQGNa" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2l9" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -9701,7 +9701,7 @@
                                   <node concept="3y3z36" id="6FK1Pb8udWl" role="3uHU7B">
                                     <node concept="2OqwBi" id="6FK1Pb8udWm" role="3uHU7B">
                                       <node concept="37vLTw" id="6FK1Pb8udWn" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6FK1Pb8uaUA" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2la" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6FK1Pb8udWo" role="2OqNvi">
                                         <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFY" resolve="exponent" />
@@ -9716,7 +9716,7 @@
                                     <node concept="2OqwBi" id="6FK1Pb8udWg" role="3uHU7B">
                                       <node concept="2OqwBi" id="6FK1Pb8udWh" role="2Oq$k0">
                                         <node concept="37vLTw" id="6FK1Pb8udWi" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6FK1Pb8uaUA" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2la" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="6FK1Pb8udWj" role="2OqNvi">
                                           <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFY" resolve="exponent" />
@@ -9730,9 +9730,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6FK1Pb8uaUA" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2la" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6FK1Pb8uaUB" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2lb" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -10391,13 +10391,13 @@
                     <property role="Xl_RC" value="The specifier's type is already covered!" />
                   </node>
                   <node concept="37vLTw" id="1wGuEUwrs0w" role="1urrMF">
-                    <ref role="3cqZAo" node="1wGuEUwrqnn" resolve="it" />
+                    <ref role="3cqZAo" node="2SR9xrsN2lc" resolve="it" />
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1wGuEUwrqnn" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2lc" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1wGuEUwrqno" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2ld" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -10933,7 +10933,7 @@
                     <node concept="3clFbF" id="5XJ1bBBLS6m" role="3cqZAp">
                       <node concept="2OqwBi" id="5XJ1bBBLS6n" role="3clFbG">
                         <node concept="37vLTw" id="5XJ1bBBLS6o" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5XJ1bBBLS6r" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2le" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="5XJ1bBBLS6p" role="2OqNvi">
                           <node concept="chp4Y" id="5XJ1bBBLS6q" role="cj9EA">
@@ -10943,9 +10943,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5XJ1bBBLS6r" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2le" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5XJ1bBBLS6s" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2lf" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11030,7 +11030,7 @@
                         <node concept="3clFbF" id="79uxL3R8Qzt" role="3cqZAp">
                           <node concept="2OqwBi" id="79uxL3R8RAB" role="3clFbG">
                             <node concept="37vLTw" id="79uxL3R8Qzs" role="2Oq$k0">
-                              <ref role="3cqZAo" node="79uxL3R8P2J" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2lg" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="79uxL3R8U75" role="2OqNvi">
                               <node concept="chp4Y" id="79uxL3R8X0d" role="cj9EA">
@@ -11040,9 +11040,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="79uxL3R8P2J" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2lg" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="79uxL3R8P2K" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2lh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11053,7 +11053,7 @@
                       <node concept="3clFbF" id="79uxL3R94tj" role="3cqZAp">
                         <node concept="1PxgMI" id="79uxL3R962o" role="3clFbG">
                           <node concept="37vLTw" id="79uxL3R94ti" role="1m5AlR">
-                            <ref role="3cqZAo" node="79uxL3R92p1" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2li" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="79i$vAY7bFU" role="3oSUPX">
                             <ref role="cht4Q" to="qlb5:7eOyx9raabt" resolve="MetaUnit" />
@@ -11061,9 +11061,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="79uxL3R92p1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2li" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="79uxL3R92p2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2lj" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -11593,7 +11593,7 @@
                           </node>
                           <node concept="2OqwBi" id="5PsWxcFz2lp" role="3uHU7B">
                             <node concept="37vLTw" id="5PsWxcFz2lq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5PsWxcFz2ls" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2lk" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5PsWxcF_rIH" role="2OqNvi">
                               <ref role="3Tt5mk" to="qlb5:5W7baqyQp5n" resolve="metaUnit" />
@@ -11602,9 +11602,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5PsWxcFz2ls" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2lk" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5PsWxcFz2lt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2ll" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd
index 7a8a58d1f82..d21b594cad2 100644
--- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd
+++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.math.interpreter" uuid="520b2574-9e8e-494c-be1c-29230f93a13d" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.ext.math.interpreter" uuid="520b2574-9e8e-494c-be1c-29230f93a13d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">b574d547-b77e-4fed-9f60-c349c4410765(com.mbeddr.ext.math)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/models/plugin.mps b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/models/plugin.mps
index 3dbcf29445f..71803dedf3f 100644
--- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -84,7 +84,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -171,7 +171,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd
index 0456385001d..25c2a71bba8 100644
--- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd
+++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.units.interpreter" uuid="3cce130c-6f00-4a56-80e2-437ae2deed58" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.ext.units.interpreter" uuid="3cce130c-6f00-4a56-80e2-437ae2deed58" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">679ff375-ddae-46fa-9503-1507abcab123(com.mbeddr.core.expressions.interpreter)</dependency>
     <dependency reexport="false">0d04a6cc-773e-4069-b9b0-11884b2ff1c8(com.mbeddr.ext.units)</dependency>
@@ -19,7 +18,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -73,7 +72,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/models/plugin.mps b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/models/plugin.mps
index e440f4fbd72..37b0917fa44 100644
--- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/models/plugin.mps
+++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/models/plugin.mps
@@ -24,7 +24,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -76,7 +76,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd
index 61161f15b79..7e06eeca70b 100644
--- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd
+++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.ext.units.runtime" uuid="30d40e06-2249-4bd3-b8ab-109459f5021f" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.ext.units.runtime" uuid="30d40e06-2249-4bd3-b8ab-109459f5021f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">b574d547-b77e-4fed-9f60-c349c4410765(com.mbeddr.ext.math)</dependency>
@@ -23,7 +22,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -80,7 +79,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/models/com/mbeddr/ext/units/runtime/plugin.mps b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/models/com/mbeddr/ext/units/runtime/plugin.mps
index 58ef658b00c..f2d9081f3dd 100644
--- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/models/com/mbeddr/ext/units/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/models/com/mbeddr/ext/units/runtime/plugin.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -59,7 +59,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -172,7 +172,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -195,7 +195,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -207,6 +207,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -342,7 +343,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -402,7 +403,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
@@ -2571,7 +2571,7 @@
                       <node concept="2OqwBi" id="4DRdDUoCUJf" role="3clFbG">
                         <node concept="2OqwBi" id="4DRdDUoCTgo" role="2Oq$k0">
                           <node concept="37vLTw" id="4DRdDUoCT8W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4DRdDUoCT4u" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2AM" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4DRdDUoCU6$" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2586,9 +2586,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4DRdDUoCT4u" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2AM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4DRdDUoCT4v" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2AN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3196,14 +3196,14 @@
                         <node concept="1rXfSq" id="3M4aPu_2GB9" role="3clFbG">
                           <ref role="37wK5l" node="3M4aPu_2pcA" resolve="isIntegerType" />
                           <node concept="37vLTw" id="3M4aPu_2GQ9" role="37wK5m">
-                            <ref role="3cqZAo" node="3M4aPu_2GnG" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2AO" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3M4aPu_2GnG" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2AO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3M4aPu_2GnH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2AP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3991,7 +3991,7 @@
                       <node concept="2Ke9KJ" id="2Jcs$lv2Uqt" role="2OqNvi">
                         <node concept="2OqwBi" id="2Jcs$lv2UBK" role="25WWJ7">
                           <node concept="37vLTw" id="2Jcs$lv2Uyj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2Jcs$lv2S_n" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2AQ" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2Jcs$lv2V3u" role="2OqNvi">
                             <ref role="3Tt5mk" to="qlb5:7eOyx9r3qFW" resolve="unit" />
@@ -4001,9 +4001,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2Jcs$lv2S_n" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2AQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2Jcs$lv2S_o" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2AR" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7081,7 +7081,7 @@
                             <node concept="2OqwBi" id="26hWC1HwDDh" role="3clFbG">
                               <node concept="2OqwBi" id="26hWC1HwDDi" role="2Oq$k0">
                                 <node concept="37vLTw" id="26hWC1HwDDj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="26hWC1HwDDn" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2AS" resolve="it" />
                                 </node>
                                 <node concept="2OwXpG" id="26hWC1HwDDk" role="2OqNvi">
                                   <ref role="2Oxat5" node="5dSoB2LOIpJ" resolve="unit" />
@@ -7095,9 +7095,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="26hWC1HwDDn" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2AS" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="26hWC1HwDDo" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2AT" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -7126,7 +7126,7 @@
                             <node concept="2OqwBi" id="26hWC1HwSiZ" role="3clFbG">
                               <node concept="2OqwBi" id="26hWC1HwSj0" role="2Oq$k0">
                                 <node concept="37vLTw" id="26hWC1HwSj1" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="26hWC1HwSj5" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2AU" resolve="it" />
                                 </node>
                                 <node concept="2OwXpG" id="26hWC1HwSj2" role="2OqNvi">
                                   <ref role="2Oxat5" node="5dSoB2LOIpJ" resolve="unit" />
@@ -7140,9 +7140,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="26hWC1HwSj5" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2AU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="26hWC1HwSj6" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2AV" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -7311,7 +7311,7 @@
                                 <node concept="3clFbF" id="2RfL3oOv_Q8" role="3cqZAp">
                                   <node concept="2OqwBi" id="5dSoB2LZqPn" role="3clFbG">
                                     <node concept="37vLTw" id="2RfL3oOv_Q7" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2RfL3oOv_3Y" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2AW" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="5dSoB2LZtbS" role="2OqNvi">
                                       <ref role="37wK5l" node="5dSoB2LVXtn" resolve="isMultipleOf" />
@@ -7327,9 +7327,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2RfL3oOv_3Y" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2AW" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2RfL3oOv_3Z" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2AX" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -7399,7 +7399,7 @@
                                 <node concept="3clFbF" id="2RfL3oOvMo6" role="3cqZAp">
                                   <node concept="2OqwBi" id="5dSoB2LZMsQ" role="3clFbG">
                                     <node concept="37vLTw" id="2RfL3oOvMoa" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2RfL3oOvMoe" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2AY" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="5dSoB2LZOGP" role="2OqNvi">
                                       <ref role="37wK5l" node="5dSoB2LVXtn" resolve="isMultipleOf" />
@@ -7415,9 +7415,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2RfL3oOvMoe" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2AY" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2RfL3oOvMof" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2AZ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/com.mbeddr.ext/solutions/test.editor.ext/models/test/editor/ext/components@tests.mps b/code/languages/com.mbeddr.ext/solutions/test.editor.ext/models/test/editor/ext/components@tests.mps
index 1563e1d150d..d6378cc9374 100644
--- a/code/languages/com.mbeddr.ext/solutions/test.editor.ext/models/test/editor/ext/components@tests.mps
+++ b/code/languages/com.mbeddr.ext/solutions/test.editor.ext/models/test/editor/ext/components@tests.mps
@@ -8,7 +8,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="0" />
     <use id="97d24244-51db-4e2e-97fc-7bd73b1f5f40" name="com.mbeddr.ext.components" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="b574d547-b77e-4fed-9f60-c349c4410765" name="com.mbeddr.ext.math" version="0" />
     <devkit ref="24565007-e59f-42fc-ac10-da3836deec1c(com.mbeddr.components)" />
@@ -114,7 +114,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,13 +126,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -171,7 +171,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -179,14 +179,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -226,7 +226,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -331,7 +331,7 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
-      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ng" index="3VxgRd">
+      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ngI" index="3VxgRd">
         <reference id="5703827575549009244" name="element" index="3VxgQD" />
       </concept>
       <concept id="5703827575549009178" name="com.mbeddr.ext.components.structure.InterfaceTypeDataRefTarget" flags="ng" index="3VxgRJ" />
@@ -355,7 +355,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd b/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd
index 935d28c4823..ed77380f44c 100644
--- a/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd
+++ b/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.editor.ext" uuid="578ac46a-d23e-4d41-919e-312fa2683e3f" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="test.editor.ext" uuid="578ac46a-d23e-4d41-919e-312fa2683e3f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -55,12 +54,12 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:5dc5fc0d-37ef-4782-8192-8b5ce1f69f80:jetbrains.mps.baseLanguage.extensionMethods" version="0" />
     <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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd
index 54112036ee8..c64fec28df7 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.comp_mocking" uuid="e25a40ff-8151-4b8f-ba37-3b49794e8872" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.comp_mocking" uuid="e25a40ff-8151-4b8f-ba37-3b49794e8872" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -48,7 +47,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/failing@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/failing@tests.mps
index 71a7b182c46..058dd71f7ea 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/failing@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/failing@tests.mps
@@ -62,7 +62,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -78,7 +78,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -86,14 +86,14 @@
       <concept id="6512473996287153137" name="com.mbeddr.core.modules.structure.Section" flags="ng" index="fMItD">
         <child id="6512473996287153139" name="contents" index="fMItF" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -112,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -157,7 +157,7 @@
       <concept id="591155063063570513" name="com.mbeddr.ext.components.structure.InitializeConfiguration" flags="ng" index="3t9XKO">
         <reference id="591155063063570514" name="config" index="3t9XKR" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -166,7 +166,7 @@
       <concept id="3005510381523579442" name="com.mbeddr.core.expressions.structure.UnaryExpression" flags="ng" index="2aKSnQ">
         <child id="7254843406768839760" name="expression" index="1_9fRO" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m1@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m1@tests.mps
index 7a545b4c8aa..70f807cf803 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m1@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m1@tests.mps
@@ -66,7 +66,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -107,7 +107,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -158,7 +158,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -170,7 +170,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -178,7 +178,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -218,7 +218,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -291,15 +291,15 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ng" index="3VxgRd">
+      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ngI" index="3VxgRd">
         <reference id="5703827575549009244" name="element" index="3VxgQD" />
       </concept>
       <concept id="5703827575547552890" name="com.mbeddr.ext.components.structure.DataElementRefTarget" flags="ng" index="3VJJif" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -316,7 +316,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m3@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m3@tests.mps
index 2f2ca58a299..d92b3f0e133 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m3@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/m3@tests.mps
@@ -57,7 +57,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
       <concept id="6307143892175831839" name="com.mbeddr.core.util.structure.IsInRangeExpression" flags="ng" index="1vVjFF" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -100,7 +100,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -122,7 +122,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -182,7 +182,7 @@
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -195,7 +195,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stubInheritance@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stubInheritance@tests.mps
index c0e2a7fe3f1..2baa2fd4ae5 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stubInheritance@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stubInheritance@tests.mps
@@ -51,7 +51,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -78,7 +78,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -97,7 +97,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +134,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stub_with_many_ports@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stub_with_many_ports@tests.mps
index 93ae54bb794..083d5afca92 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stub_with_many_ports@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/models/test/ex/ext/comp_mocking/stub_with_many_ports@tests.mps
@@ -51,7 +51,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -81,7 +81,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -146,7 +146,7 @@
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -159,7 +159,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/compositecomponent/plainC.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/compositecomponent/plainC.mps
index 2f467f58cb0..ce7fbe9e948 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/compositecomponent/plainC.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/compositecomponent/plainC.mps
@@ -75,7 +75,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -106,7 +106,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -119,7 +119,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -158,7 +158,7 @@
       <concept id="7540109328385923714" name="com.mbeddr.ext.compositecomponents.structure.CompositeComponentsConfigItem" flags="ng" index="1eFCfY" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -180,7 +180,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910397379" name="com.mbeddr.ext.concurrency.structure.CyclicTaskKind" flags="ng" index="3JZT9E" />
@@ -238,7 +238,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/plainC.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/plainC.mps
index e2912a06f81..e1bf906d578 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/plainC.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/plainC.mps
@@ -75,7 +75,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -106,7 +106,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -119,7 +119,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -153,7 +153,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -175,7 +175,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910397379" name="com.mbeddr.ext.concurrency.structure.CyclicTaskKind" flags="ng" index="3JZT9E" />
@@ -233,7 +233,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/pthreads.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/pthreads.mps
index fce14f0e61c..662fa2aeca7 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/pthreads.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/externalSchedule/pthreads.mps
@@ -39,7 +39,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -55,7 +55,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -66,7 +66,7 @@
       <concept id="7540109328385923714" name="com.mbeddr.ext.compositecomponents.structure.CompositeComponentsConfigItem" flags="ng" index="1eFCfY" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/plainC.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/plainC.mps
index b5e3c842562..6fb5817e03d 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/plainC.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/plainC.mps
@@ -90,7 +90,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -121,7 +121,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -134,7 +134,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -176,7 +176,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -198,7 +198,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910397379" name="com.mbeddr.ext.concurrency.structure.CyclicTaskKind" flags="ng" index="3JZT9E" />
@@ -274,7 +274,7 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -289,7 +289,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/pthreads.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/pthreads.mps
index a5d6acac3f6..cef2e7d5700 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/pthreads.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/scheduleInCompositeComponent/pthreads.mps
@@ -39,7 +39,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -55,7 +55,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -66,7 +66,7 @@
       <concept id="7540109328385923714" name="com.mbeddr.ext.compositecomponents.structure.CompositeComponentsConfigItem" flags="ng" index="1eFCfY" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/plainC.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/plainC.mps
index 4447fda00b1..14c598bfb95 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/plainC.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/plainC.mps
@@ -74,7 +74,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -105,7 +105,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -118,7 +118,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -152,7 +152,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -174,7 +174,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910397379" name="com.mbeddr.ext.concurrency.structure.CyclicTaskKind" flags="ng" index="3JZT9E" />
@@ -244,7 +244,7 @@
         <reference id="591155063063570514" name="config" index="3t9XKR" />
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -258,7 +258,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/pthreads.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/pthreads.mps
index cddc6a42da2..880e292a3ab 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/pthreads.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/models/test/ex/ext/components/concurrency/simple/pthreads.mps
@@ -43,7 +43,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -59,7 +59,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -67,7 +67,7 @@
       <concept id="8610007178384196427" name="com.mbeddr.core.unittest.structure.UnitTestConfigItem" flags="ng" index="12mU2y" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd
index 5b39091f680..72b58463e37 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.components.concurrency" uuid="8b3efe9e-e578-4a3b-8e45-fe3292d81fb0" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.components.concurrency" uuid="8b3efe9e-e578-4a3b-8e45-fe3292d81fb0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
     <dependency reexport="false">90e86bc3-eb2a-4a38-bef8-65c10092430e(test.ex.ext.concurrency.plainC)</dependency>
@@ -55,7 +54,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/models/test/ex/ext/components/sri/main@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/models/test/ex/ext/components/sri/main@tests.mps
index dbdc0bbed78..bf40ce10204 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/models/test/ex/ext/components/sri/main@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/models/test/ex/ext/components/sri/main@tests.mps
@@ -19,7 +19,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -71,7 +71,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -129,7 +129,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -140,7 +140,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -148,7 +148,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -196,7 +196,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -277,17 +277,17 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ng" index="3VxgRd">
+      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ngI" index="3VxgRd">
         <reference id="5703827575549009244" name="element" index="3VxgQD" />
       </concept>
       <concept id="5703827575549009178" name="com.mbeddr.ext.components.structure.InterfaceTypeDataRefTarget" flags="ng" index="3VxgRJ" />
       <concept id="5703827575549398512" name="com.mbeddr.ext.components.structure.PortAdapterElementRefTarget" flags="ng" index="3VALO5" />
       <concept id="5703827575547552890" name="com.mbeddr.ext.components.structure.DataElementRefTarget" flags="ng" index="3VJJif" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -304,7 +304,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd
index a8b13eaa1f5..83b166c1200 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.components.sri" uuid="af2a3290-7101-4a18-8717-201d09570085" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.components.sri" uuid="af2a3290-7101-4a18-8717-201d09570085" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -36,7 +35,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
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 5df0a26580b..3c4a4925ac2 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.components" uuid="918bed95-9fff-4e37-86fa-fc4753295149" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.components" uuid="918bed95-9fff-4e37-86fa-fc4753295149" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -12,7 +12,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -57,7 +56,7 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/abstractRunable@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/abstractRunable@tests.mps
index 41e0b2dcee1..6a4dee580cd 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/abstractRunable@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/abstractRunable@tests.mps
@@ -9,7 +9,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" name="com.mbeddr.mpsutil.jung" version="0" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" name="com.mbeddr.mpsutil.plantuml.node" version="0" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
@@ -50,7 +50,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -68,7 +68,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -80,7 +80,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -104,7 +104,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -163,7 +163,7 @@
       <concept id="591155063063570513" name="com.mbeddr.ext.components.structure.InitializeConfiguration" flags="ng" index="3t9XKO">
         <reference id="591155063063570514" name="config" index="3t9XKR" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -176,7 +176,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug1214@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug1214@tests.mps
index 728675ddb73..3efc734b7ed 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug1214@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug1214@tests.mps
@@ -37,7 +37,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -55,7 +55,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -66,7 +66,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -74,7 +74,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -110,7 +110,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -170,7 +170,7 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -183,7 +183,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug124@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug124@tests.mps
index 5268ab97a73..a6ddbd198f9 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug124@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug124@tests.mps
@@ -16,7 +16,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
@@ -47,7 +47,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -81,7 +81,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -89,7 +89,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -99,7 +99,7 @@
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -141,7 +141,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug367@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug367@tests.mps
index a081bbe3725..8e445154952 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug367@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug367@tests.mps
@@ -50,7 +50,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -83,7 +83,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -110,7 +110,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -160,11 +160,11 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -173,7 +173,7 @@
       <concept id="3005510381523579442" name="com.mbeddr.core.expressions.structure.UnaryExpression" flags="ng" index="2aKSnQ">
         <child id="7254843406768839760" name="expression" index="1_9fRO" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug547@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug547@tests.mps
index d582830cfae..84f61b607cd 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug547@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug547@tests.mps
@@ -18,7 +18,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -55,7 +55,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -87,7 +87,7 @@
       <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -96,7 +96,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -164,7 +164,7 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -177,7 +177,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug615@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug615@tests.mps
index 40f8980ceb8..cab92a939d6 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug615@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug615@tests.mps
@@ -54,7 +54,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -72,7 +72,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -84,7 +84,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -114,7 +114,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -176,11 +176,11 @@
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -193,7 +193,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug743@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug743@tests.mps
index 8c072329cac..ae3f8bd7654 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug743@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bug743@tests.mps
@@ -47,7 +47,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -65,7 +65,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -77,7 +77,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -101,7 +101,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -168,7 +168,7 @@
         <reference id="591155063063570514" name="config" index="3t9XKR" />
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -181,7 +181,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bugAccent1602@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bugAccent1602@tests.mps
index c9d8b490fe9..1b4d8956cb8 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bugAccent1602@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/bugAccent1602@tests.mps
@@ -37,7 +37,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -56,7 +56,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -68,7 +68,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -100,7 +100,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -145,7 +145,7 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -156,7 +156,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/commenting@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/commenting@tests.mps
index fff5f9d0f14..6aa563fa09c 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/commenting@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/commenting@tests.mps
@@ -43,7 +43,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -73,7 +73,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -105,7 +105,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -150,11 +150,11 @@
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -164,7 +164,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/compWithDectab@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/compWithDectab@tests.mps
index 11d2b1c2652..bc100daad5f 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/compWithDectab@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/compWithDectab@tests.mps
@@ -44,7 +44,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -77,14 +77,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
@@ -109,7 +109,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -157,7 +157,7 @@
       <concept id="2103658896110121032" name="com.mbeddr.ext.components.structure.ComponentsConfigItem" flags="ng" index="3i2$bm">
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -170,7 +170,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentInheritance@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentInheritance@tests.mps
index ba24f2b79a4..5b6910d833e 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentInheritance@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentInheritance@tests.mps
@@ -56,7 +56,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -72,7 +72,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -84,7 +84,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -92,7 +92,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -126,7 +126,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -195,11 +195,11 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -213,7 +213,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentTypes@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentTypes@tests.mps
index 0e5882f0313..84353a39171 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentTypes@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentTypes@tests.mps
@@ -17,7 +17,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -54,7 +54,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -76,7 +76,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -128,7 +128,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -185,7 +185,7 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -198,7 +198,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentWithCallback@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentWithCallback@tests.mps
index d2d3a7dff58..369509461a3 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentWithCallback@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/componentWithCallback@tests.mps
@@ -49,7 +49,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -73,7 +73,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -92,17 +92,17 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -140,7 +140,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -174,7 +174,7 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -186,7 +186,7 @@
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/comptest@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/comptest@tests.mps
index b9c110e837e..6cd4bb59a2b 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/comptest@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/comptest@tests.mps
@@ -63,7 +63,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -99,7 +99,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -118,7 +118,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -126,7 +126,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -152,7 +152,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -236,7 +236,7 @@
         <reference id="3151699502282407541" name="providedPort" index="2jV6Ia" />
         <reference id="8922663937488423833" name="component" index="3nZ20a" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -250,7 +250,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/directRunnableCall@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/directRunnableCall@tests.mps
index 8e0ac1cda15..d568b8850dc 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/directRunnableCall@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/directRunnableCall@tests.mps
@@ -59,7 +59,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -80,7 +80,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -91,14 +91,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -130,7 +130,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -159,7 +159,7 @@
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -172,7 +172,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/helloComponents@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/helloComponents@tests.mps
index 71145a2a9c1..e145b7daf3f 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/helloComponents@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/helloComponents@tests.mps
@@ -51,7 +51,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -83,7 +83,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -111,7 +111,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -193,11 +193,11 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -210,7 +210,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/inline@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/inline@tests.mps
index 042985e81ba..81dcc04f604 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/inline@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/inline@tests.mps
@@ -44,7 +44,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -63,7 +63,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -74,7 +74,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -82,7 +82,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -114,7 +114,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -180,11 +180,11 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -199,7 +199,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypes@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypes@tests.mps
index c74e32ebe27..dc63b44d63e 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypes@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypes@tests.mps
@@ -55,7 +55,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -71,7 +71,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -83,7 +83,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -91,7 +91,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -136,7 +136,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -215,11 +215,11 @@
         <reference id="4075471389393865550" name="providedPort" index="3LA33G" />
       </concept>
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -235,7 +235,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypesStaticallyWired@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypesStaticallyWired@tests.mps
index 7ef0f695fb8..6796c6e2386 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypesStaticallyWired@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/interfaceTypesStaticallyWired@tests.mps
@@ -48,7 +48,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -67,7 +67,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -79,7 +79,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -87,7 +87,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -117,7 +117,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -178,7 +178,7 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -193,7 +193,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPorts@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPorts@tests.mps
index 855be7c3209..4d3e3e56d61 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPorts@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPorts@tests.mps
@@ -49,7 +49,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -67,7 +67,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -75,14 +75,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -116,7 +116,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -193,11 +193,11 @@
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
       <concept id="6616054089643593442" name="com.mbeddr.ext.components.structure.PortItExpression" flags="ng" index="1SaJN6" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -210,7 +210,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPortsStaticallyWired@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPortsStaticallyWired@tests.mps
index 1fde80d2bbf..fec7aad8c85 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPortsStaticallyWired@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multiPortsStaticallyWired@tests.mps
@@ -49,7 +49,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -68,7 +68,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -76,14 +76,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -201,11 +201,11 @@
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -218,7 +218,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/ppc@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/ppc@tests.mps
index 1be07105968..01af09ef359 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/ppc@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/ppc@tests.mps
@@ -49,7 +49,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -83,7 +83,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -95,7 +95,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -103,7 +103,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -137,7 +137,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -225,7 +225,7 @@
       <concept id="6209278014150856509" name="com.mbeddr.ext.components.structure.OldQueryOpCall" flags="ng" index="3Zcgp9">
         <reference id="6209278014150856526" name="op" index="3ZcgoU" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -240,7 +240,7 @@
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/reconnect@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/reconnect@tests.mps
index 12aa76f2d40..fba61e0b1fa 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/reconnect@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/reconnect@tests.mps
@@ -44,7 +44,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -62,7 +62,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -74,7 +74,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -96,7 +96,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -143,7 +143,7 @@
       <concept id="2103658896110121032" name="com.mbeddr.ext.components.structure.ComponentsConfigItem" flags="ng" index="3i2$bm">
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -151,7 +151,7 @@
         <reference id="1482737808881361966" name="port" index="1XYpC0" />
         <child id="1482737808881166717" name="portAdapter" index="1XX9tj" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -164,7 +164,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/staticWiring@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/staticWiring@tests.mps
index 83ad7bd6e65..1b3690c846e 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/staticWiring@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/staticWiring@tests.mps
@@ -55,7 +55,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -74,7 +74,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -82,14 +82,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -213,11 +213,11 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -231,7 +231,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/_generators_coverage.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/_generators_coverage.mps
index bfec232e74a..16fdfc879a9 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/_generators_coverage.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/_generators_coverage.mps
@@ -33,7 +33,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890dynamic@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890dynamic@tests.mps
index 7357b6defe2..f6afa2068cd 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890dynamic@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890dynamic@tests.mps
@@ -45,7 +45,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -64,7 +64,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -76,7 +76,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -106,7 +106,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -170,11 +170,11 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -187,7 +187,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890static@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890static@tests.mps
index 22f04dc76db..9f6f2b68a4a 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890static@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/bug890static@tests.mps
@@ -45,7 +45,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -64,7 +64,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -76,7 +76,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -106,7 +106,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -170,11 +170,11 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -187,7 +187,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/compWithArrayField@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/compWithArrayField@tests.mps
index 7c1b02b7e63..69a4a1b2cfc 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/compWithArrayField@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/compWithArrayField@tests.mps
@@ -13,7 +13,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -48,7 +48,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -74,7 +74,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -82,14 +82,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -132,7 +132,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -171,7 +171,7 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -185,7 +185,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/constFields@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/constFields@tests.mps
index 82fa6ba3983..25d78f88144 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/constFields@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/test/ex/ext/components/constFields@tests.mps
@@ -14,7 +14,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -48,7 +48,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -74,7 +74,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -86,7 +86,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -116,7 +116,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -150,7 +150,7 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -163,7 +163,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
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 1c33bfd9c0c..3729a4e01a8 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.compositeComponents" uuid="3f1bb534-4961-4bf0-94b6-2b63276a46ca" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.compositeComponents" uuid="3f1bb534-4961-4bf0-94b6-2b63276a46ca" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">54f2a59b-97bb-4c09-af92-928ebf9c5966(com.mbeddr.ext.compositecomponents)</dependency>
   </dependencies>
@@ -53,7 +52,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
@@ -112,7 +111,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="3f1bb534-4961-4bf0-94b6-2b63276a46ca(test.ex.ext.compositeComponents)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test.ex.ext.compositeComponents.basic.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test.ex.ext.compositeComponents.basic.mps
index 00e47b7cbbd..a8cb0e3d8c6 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test.ex.ext.compositeComponents.basic.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test.ex.ext.compositeComponents.basic.mps
@@ -23,7 +23,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -48,7 +48,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -64,7 +64,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -107,13 +107,13 @@
         <reference id="591155063063570514" name="config" index="3t9XKR" />
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1198.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1198.mps
index 7b41098dca5..463452a0144 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1198.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1198.mps
@@ -38,7 +38,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -57,19 +57,19 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -115,7 +115,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -169,7 +169,7 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="4075471389393921682" name="com.mbeddr.ext.components.structure.InterfaceTypeOpCallExpr" flags="ng" index="3LAlOK" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -182,7 +182,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1206.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1206.mps
index cb56025ba31..525bcd641ea 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1206.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/BugGithub1206.mps
@@ -38,7 +38,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -56,7 +56,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -65,7 +65,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -98,7 +98,7 @@
       <concept id="7540109328385923714" name="com.mbeddr.ext.compositecomponents.structure.CompositeComponentsConfigItem" flags="ng" index="1eFCfY" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -130,7 +130,7 @@
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/embedded.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/embedded.mps
index 4960fd0f4ed..9cee839dee9 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/embedded.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/embedded.mps
@@ -53,7 +53,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -71,7 +71,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -80,7 +80,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -115,7 +115,7 @@
       <concept id="6847490852670653132" name="com.mbeddr.core.embedded.structure.EmulatedRegisterKind" flags="ng" index="3VbeTE" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -144,7 +144,7 @@
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/tests.mps
index ce21513ed5d..69caf6f234f 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/tests.mps
@@ -63,7 +63,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -82,7 +82,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -104,7 +104,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -112,7 +112,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -180,7 +180,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -268,11 +268,11 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -290,7 +290,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/delay.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/delay.mps
index b1dfd08c314..a563ec89bc6 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/delay.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/delay.mps
@@ -57,7 +57,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -73,7 +73,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -86,7 +86,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -120,7 +120,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -142,7 +142,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -168,7 +168,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTask.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTask.mps
index 2e99ce460d2..51ef52ad037 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTask.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTask.mps
@@ -14,7 +14,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -57,7 +57,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -81,7 +81,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -101,7 +101,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -131,7 +131,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -153,7 +153,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -184,7 +184,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTaskWithVariables.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTaskWithVariables.mps
index 50270e54804..ff93afa6660 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTaskWithVariables.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/singleTaskWithVariables.mps
@@ -45,7 +45,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -81,7 +81,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -111,7 +111,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -143,7 +143,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -173,7 +173,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/time.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/time.mps
index 23b5a977083..8df70c2b631 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/time.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/time.mps
@@ -7,7 +7,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -58,10 +58,10 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
-      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ng" index="2I2SlH">
+      <concept id="7713191144372389655" name="com.mbeddr.core.modules.structure.ITypeDef" flags="ngI" index="2I2SlH">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -69,7 +69,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
@@ -84,7 +84,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -103,7 +103,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="6610873504380029780" name="com.mbeddr.core.expressions.structure.CastExpression" flags="ng" index="1S8S4T">
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasks.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasks.mps
index 9ad30aec87a..6dbcbaa0d41 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasks.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasks.mps
@@ -64,7 +64,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -89,7 +89,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -102,7 +102,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -134,7 +134,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -156,7 +156,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910397379" name="com.mbeddr.ext.concurrency.structure.CyclicTaskKind" flags="ng" index="3JZT9E" />
@@ -183,7 +183,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithAtomic.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithAtomic.mps
index 256a078ceaa..a426cff981c 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithAtomic.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithAtomic.mps
@@ -14,7 +14,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -57,7 +57,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -93,7 +93,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -113,7 +113,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -146,7 +146,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -169,7 +169,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910884876" name="com.mbeddr.ext.concurrency.structure.AtomicStatement" flags="ng" index="3JTIQ_">
@@ -207,7 +207,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithBlockingQueue.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithBlockingQueue.mps
index 160f711c31a..916bb052fac 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithBlockingQueue.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithBlockingQueue.mps
@@ -64,7 +64,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -101,7 +101,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -138,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -179,7 +179,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -210,7 +210,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEvents.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEvents.mps
index 0fa73d5acc2..e9d22c40916 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEvents.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEvents.mps
@@ -15,7 +15,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -59,7 +59,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -98,7 +98,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -118,7 +118,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -152,7 +152,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -171,7 +171,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -207,7 +207,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEventsAndTimeouts.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEventsAndTimeouts.mps
index 5f0d7adbe50..8377014698c 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEventsAndTimeouts.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithEventsAndTimeouts.mps
@@ -15,7 +15,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -67,7 +67,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -97,7 +97,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -113,7 +113,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -149,7 +149,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -207,7 +207,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -251,7 +251,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithQueue.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithQueue.mps
index 71ac5977653..7b170b4c438 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithQueue.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/twoTasksWithQueue.mps
@@ -64,7 +64,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -88,7 +88,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -101,7 +101,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -138,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -177,7 +177,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -206,7 +206,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/variousTimeouts.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/variousTimeouts.mps
index 0544f44bb78..6005275ad5c 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/variousTimeouts.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/variousTimeouts.mps
@@ -15,7 +15,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -75,7 +75,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -102,7 +102,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -122,7 +122,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -153,7 +153,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -175,7 +175,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -219,7 +219,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/yield.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/yield.mps
index a82abccbab8..9d5ecba0a19 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/yield.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/models/test/ex/ext/concurrency/plainC/yield.mps
@@ -69,7 +69,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -90,7 +90,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -103,7 +103,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -137,7 +137,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -157,7 +157,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -182,7 +182,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd
index e8764ee82f4..dac20214fa0 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.concurrency.plainC" uuid="90e86bc3-eb2a-4a38-bef8-65c10092430e" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.concurrency.plainC" uuid="90e86bc3-eb2a-4a38-bef8-65c10092430e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -46,7 +45,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/resources.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/resources.mps
index ffa774a06bc..8c8288d5cba 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/resources.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/resources.mps
@@ -60,7 +60,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -74,7 +74,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -83,7 +83,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -128,7 +128,7 @@
         <reference id="7468393218933864104" name="res" index="1uQ2qS" />
       </concept>
       <concept id="7468393218933745374" name="com.mbeddr.ext.concurrency.structure.ResourceDeclaration" flags="ng" index="1uRBre" />
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910884876" name="com.mbeddr.ext.concurrency.structure.AtomicStatement" flags="ng" index="3JTIQ_">
@@ -163,7 +163,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTask.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTask.mps
index 18fd2446002..86719356e16 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTask.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTask.mps
@@ -13,7 +13,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -60,7 +60,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -79,7 +79,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -95,7 +95,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -128,7 +128,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -158,7 +158,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -192,7 +192,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithPeriodConstraint.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithPeriodConstraint.mps
index 445b9178af3..1acaf29bfe9 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithPeriodConstraint.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithPeriodConstraint.mps
@@ -40,7 +40,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -51,7 +51,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -64,7 +64,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -83,7 +83,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -109,7 +109,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -148,7 +148,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithVariables.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithVariables.mps
index 08c44922ece..f6f32eb82da 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithVariables.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithVariables.mps
@@ -45,7 +45,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -56,7 +56,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -72,7 +72,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -133,7 +133,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -170,7 +170,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithWCET.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithWCET.mps
index ec398ff25f5..3da8bb4e50e 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithWCET.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/singleTaskWithWCET.mps
@@ -46,7 +46,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -57,7 +57,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -73,7 +73,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -92,7 +92,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -114,7 +114,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -156,7 +156,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasks.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasks.mps
index 4957910ef36..e1caece4468 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasks.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasks.mps
@@ -12,7 +12,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -55,7 +55,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -86,7 +86,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -102,7 +102,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -132,7 +132,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -154,7 +154,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -187,7 +187,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithAtomic.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithAtomic.mps
index f6dd7d781e5..a060958320a 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithAtomic.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithAtomic.mps
@@ -12,7 +12,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -55,7 +55,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -86,7 +86,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -102,7 +102,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -135,7 +135,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -158,7 +158,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910884876" name="com.mbeddr.ext.concurrency.structure.AtomicStatement" flags="ng" index="3JTIQ_">
@@ -202,7 +202,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithBlockingQueue.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithBlockingQueue.mps
index 9fd8ac2b1b9..b054ea84662 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithBlockingQueue.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithBlockingQueue.mps
@@ -63,7 +63,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -82,7 +82,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -95,7 +95,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -132,7 +132,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -172,7 +172,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -210,7 +210,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEvents.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEvents.mps
index c4487e0e44d..f3caa903ae9 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEvents.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEvents.mps
@@ -14,7 +14,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -58,7 +58,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -92,7 +92,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -112,7 +112,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -146,7 +146,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -168,7 +168,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -210,7 +210,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEventsAndTimeouts.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEventsAndTimeouts.mps
index 2a9b7b906a4..fe5ba9d87d2 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEventsAndTimeouts.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithEventsAndTimeouts.mps
@@ -14,7 +14,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
@@ -64,7 +64,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -86,7 +86,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -99,7 +99,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -136,7 +136,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -187,7 +187,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -237,7 +237,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithQueue.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithQueue.mps
index 1b09d42f536..074bf904cd2 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithQueue.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/twoTasksWithQueue.mps
@@ -63,7 +63,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -82,7 +82,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -95,7 +95,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -132,7 +132,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -170,7 +170,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772909978142" name="com.mbeddr.ext.concurrency.structure.TaskContextExpr" flags="ng" index="3JYjuR" />
@@ -206,7 +206,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/variousTimeouts.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/variousTimeouts.mps
index 3ae42c19317..c80e713f313 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/variousTimeouts.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/models/test/ex/ext/concurrency/variousTimeouts.mps
@@ -10,7 +10,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -70,7 +70,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774494334" name="com.mbeddr.core.buildconfig.structure.Linux" flags="ng" index="1l1yNw" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -92,7 +92,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -112,7 +112,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -143,7 +143,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -165,7 +165,7 @@
         <child id="8137843191085079198" name="body" index="1iABvq" />
         <child id="562973772910397408" name="kind" index="3JZT99" />
       </concept>
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="4932209942852262205" name="com.mbeddr.ext.concurrency.structure.BlockingConstraint" flags="ng" index="3_amfM" />
@@ -215,7 +215,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd
index 90316aa2e31..6cd8c451569 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.concurrency" uuid="0b681e67-1f30-4d18-a3fd-d036ab581a70" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.concurrency" uuid="0b681e67-1f30-4d18-a3fd-d036ab581a70" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -46,7 +45,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/mathUser@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/mathUser@tests.mps
index 8df89b9e02d..01bf0f7bfaa 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/mathUser@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/mathUser@tests.mps
@@ -21,7 +21,7 @@
       <concept id="5348704582971040037" name="com.mbeddr.ext.units.structure.UnitConfigItem" flags="ng" index="2eh4Hv" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -55,7 +55,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -70,7 +70,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -81,7 +81,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -89,7 +89,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -105,7 +105,7 @@
       <concept id="666324024671982185" name="com.mbeddr.ext.math.structure.MathConfigurationItem" flags="ng" index="22RD12" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -114,7 +114,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/simple.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/simple.mps
index 9ca53087bec..17f27dbb9b5 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/simple.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/simple.mps
@@ -43,7 +43,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -54,7 +54,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -63,7 +63,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -121,7 +121,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -132,7 +132,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/standalone@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/standalone@tests.mps
index 14e1ab1c09e..69cf7ab1e3a 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/standalone@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/test/ex/ext/math/standalone@tests.mps
@@ -29,7 +29,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -63,7 +63,7 @@
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd
index 674081f2e3d..9b384a0861f 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.math" uuid="d40b843d-a866-4fb1-8401-eb1e53ed8f40" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.math" uuid="d40b843d-a866-4fb1-8401-eb1e53ed8f40" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
   </dependencies>
@@ -46,7 +45,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -100,7 +99,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="d40b843d-a866-4fb1-8401-eb1e53ed8f40(test.ex.ext.math)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/models/test/ex/ext/messaging/tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/models/test/ex/ext/messaging/tests.mps
index 22600602a48..da18be75454 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/models/test/ex/ext/messaging/tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/models/test/ex/ext/messaging/tests.mps
@@ -12,7 +12,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -83,7 +83,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -149,7 +149,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -160,7 +160,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -168,7 +168,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -206,7 +206,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -223,7 +223,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd
index e5531d79c8b..57aaa79af48 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.messaging" uuid="80cb6e1c-8afc-4929-ae91-1ba6650d52a8" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.messaging" uuid="80cb6e1c-8afc-4929-ae91-1ba6650d52a8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/models/test/ex/ext/serialization/simple.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/models/test/ex/ext/serialization/simple.mps
index 5be690f5114..14e9322933b 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/models/test/ex/ext/serialization/simple.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/models/test/ex/ext/serialization/simple.mps
@@ -24,7 +24,7 @@
       </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -66,7 +66,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -159,7 +159,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -180,7 +180,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -188,7 +188,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -236,7 +236,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -262,7 +262,7 @@
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8863019357864392148" name="com.mbeddr.core.expressions.structure.SizeT" flags="ng" index="2O5j3L" />
@@ -270,7 +270,7 @@
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
       <concept id="22102029902365709" name="com.mbeddr.core.expressions.structure.AssignmentExpr" flags="ng" index="3pqW6w" />
       <concept id="4739982148980385695" name="com.mbeddr.core.expressions.structure.FloatType" flags="ng" index="3AreGT" />
-      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ng" index="1Ml8iu">
+      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ngI" index="1Ml8iu">
         <child id="7336544617004013388" name="valueType" index="UxbcT" />
       </concept>
       <concept id="8860443239512147449" name="com.mbeddr.core.expressions.structure.LessExpression" flags="ng" index="3Tl9Jn" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd
index c57aab1086f..9f610c11edd 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.serialization" uuid="1c219a3b-fd18-45da-9694-65383cb7ddd7" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.serialization" uuid="1c219a3b-fd18-45da-9694-65383cb7ddd7" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
   </dependencies>
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd
index 36ecd22da2a..474b02356bc 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.statemachine" uuid="3ef85fa6-42d3-4b91-b2be-19b37203ff69" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.statemachine" uuid="3ef85fa6-42d3-4b91-b2be-19b37203ff69" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="." />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -37,7 +36,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/advancedSMTesting@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/advancedSMTesting@tests.mps
index 40320ec250b..738ac62f7db 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/advancedSMTesting@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/advancedSMTesting@tests.mps
@@ -54,7 +54,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -65,7 +65,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -77,7 +77,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -85,7 +85,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -205,7 +205,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -220,7 +220,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/asTable@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/asTable@tests.mps
index 86a7e7235d5..9eb98620d03 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/asTable@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/asTable@tests.mps
@@ -14,7 +14,7 @@
   <imports />
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -49,7 +49,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -64,7 +64,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -72,14 +72,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -124,7 +124,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -136,7 +136,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3976803464656498416" name="com.mbeddr.core.expressions.structure.PostDecrementExpression" flags="ng" index="1FldXu" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/compositeSM@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/compositeSM@tests.mps
index 257c1d0c29f..c0844d54db0 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/compositeSM@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/compositeSM@tests.mps
@@ -61,7 +61,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -92,7 +92,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="3857533489766146428" name="com.mbeddr.core.base.structure.ElementDocumentation" flags="ng" index="1z9TsT">
@@ -109,7 +109,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -226,7 +226,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -243,7 +243,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/duringActions@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/duringActions@tests.mps
index 95bdc1e1428..8c96ace0bc6 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/duringActions@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/duringActions@tests.mps
@@ -51,7 +51,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -62,7 +62,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -74,7 +74,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -152,7 +152,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -167,7 +167,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/epsilon@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/epsilon@tests.mps
index 16dafb30487..1a6ab093093 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/epsilon@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/epsilon@tests.mps
@@ -50,7 +50,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -70,7 +70,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -152,7 +152,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -167,7 +167,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/exportedSM@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/exportedSM@tests.mps
index 44dca98564f..ec1d339002f 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/exportedSM@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/exportedSM@tests.mps
@@ -51,7 +51,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -62,7 +62,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -76,7 +76,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -110,7 +110,7 @@
       <concept id="5778488248013533839" name="com.mbeddr.ext.statemachines.structure.State" flags="ng" index="1LFebX" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -121,7 +121,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/helloWorld@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/helloWorld@tests.mps
index bc536c83d26..e6e7c238bdd 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/helloWorld@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/helloWorld@tests.mps
@@ -65,7 +65,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -91,7 +91,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -108,7 +108,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -251,7 +251,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -278,7 +278,7 @@
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/junctions@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/junctions@tests.mps
index 5e0c5b14ca5..591506b8992 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/junctions@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/junctions@tests.mps
@@ -50,7 +50,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -70,7 +70,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -135,7 +135,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -150,7 +150,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/macros@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/macros@tests.mps
index 66e6836db47..ee0be23e18b 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/macros@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/macros@tests.mps
@@ -50,7 +50,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -70,7 +70,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -150,7 +150,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -165,7 +165,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/statemachine_components@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/statemachine_components@tests.mps
index 164d8479bf7..675655ef2e6 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/statemachine_components@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/statemachine_components@tests.mps
@@ -74,7 +74,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -93,7 +93,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -108,7 +108,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -116,7 +116,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -264,7 +264,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -351,15 +351,15 @@
         <child id="5065104421775983811" name="expr" index="3Ovh_x" />
         <child id="5065104421775983278" name="ports" index="3OvhWc" />
       </concept>
-      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ng" index="3VxgRd">
+      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ngI" index="3VxgRd">
         <reference id="5703827575549009244" name="element" index="3VxgQD" />
       </concept>
       <concept id="5703827575547552890" name="com.mbeddr.ext.components.structure.DataElementRefTarget" flags="ng" index="3VJJif" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -380,7 +380,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3830958861296781575" name="com.mbeddr.core.expressions.structure.NotExpression" flags="ng" index="19$8ne" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/staticWiringSMInComps@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/staticWiringSMInComps@tests.mps
index d8f3c478405..1e2db57592d 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/staticWiringSMInComps@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/staticWiringSMInComps@tests.mps
@@ -50,7 +50,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -78,7 +78,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -155,7 +155,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -186,7 +186,7 @@
       </concept>
       <concept id="8515777736166878876" name="com.mbeddr.ext.components.structure.EmptyComponentContent" flags="ng" index="3Khz0B" />
       <concept id="8473757169836531451" name="com.mbeddr.ext.components.structure.DirectRunnableCallable" flags="ng" index="1KB$IV" />
-      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ng" index="1XX6Gu">
+      <concept id="1482737808881210672" name="com.mbeddr.ext.components.structure.IReferencesInstance" flags="ngI" index="1XX6Gu">
         <reference id="1482737808881210674" name="instance" index="1XX6Gs" />
         <reference id="1482737808881210673" name="config" index="1XX6Gv" />
       </concept>
@@ -198,7 +198,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/strictness@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/strictness@tests.mps
index c5d81c3fd96..5b5d660e196 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/strictness@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/test/ex/ext/statemachine/strictness@tests.mps
@@ -50,7 +50,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -69,7 +69,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -78,7 +78,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -141,7 +141,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -155,7 +155,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/models/test/ex/ext/units/main@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/models/test/ex/ext/units/main@tests.mps
index d29b6822d7d..02b4ed1d641 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/models/test/ex/ext/units/main@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/models/test/ex/ext/units/main@tests.mps
@@ -110,7 +110,7 @@
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -128,7 +128,7 @@
       <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -143,7 +143,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -151,7 +151,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -187,7 +187,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -205,13 +205,13 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8399455261460717640" name="com.mbeddr.core.expressions.structure.AndExpression" flags="ng" index="2EHzL6" />
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
       <concept id="4739982148980385695" name="com.mbeddr.core.expressions.structure.FloatType" flags="ng" index="3AreGT" />
-      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ng" index="1Ml8iu">
+      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ngI" index="1Ml8iu">
         <child id="7336544617004013388" name="valueType" index="UxbcT" />
       </concept>
       <concept id="8860443239512147449" name="com.mbeddr.core.expressions.structure.LessExpression" flags="ng" index="3Tl9Jn" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd
index f0c9ee9d639..7cc75e67eed 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.ext.units" uuid="886b2554-9e6b-4388-9d88-227321a98649" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.ext.units" uuid="886b2554-9e6b-4388-9d88-227321a98649" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0d04a6cc-773e-4069-b9b0-11884b2ff1c8(com.mbeddr.ext.units)</dependency>
   </dependencies>
@@ -36,7 +35,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -89,7 +88,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="886b2554-9e6b-4388-9d88-227321a98649(test.ex.ext.units)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/_assessment.mps b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/_assessment.mps
index e85d14bbcc6..e3f5f750c4c 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/_assessment.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/_assessment.mps
@@ -55,7 +55,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_nodes_tracing@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_nodes_tracing@tests.mps
index c2ea3840f1e..bc59806dfe6 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_nodes_tracing@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_nodes_tracing@tests.mps
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 cd00d02b1f7..7bbd8e28e13 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ext.components.nodes_tracing" uuid="3296cd37-5e43-4ad5-8880-d0471ef48d5d" moduleVersion="0" compileInMPS="true">
+<solution name="test.ext.components.nodes_tracing" uuid="3296cd37-5e43-4ad5-8880-d0471ef48d5d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">85e94e86-9fcb-43a2-9083-64c40006219e(com.mbeddr.mpsutil.nodes_tracing.test)</dependency>
@@ -56,7 +55,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_code.mps b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_code.mps
index 4267eff2993..01060600c6f 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_code.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_code.mps
@@ -62,7 +62,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -71,7 +71,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -114,7 +114,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -126,7 +126,7 @@
       </concept>
       <concept id="5763383285156373020" name="com.mbeddr.core.expressions.structure.MultiExpression" flags="ng" index="2BOcij" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_nodes_tracing@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_nodes_tracing@tests.mps
index 81428be62db..51123085437 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_nodes_tracing@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/models/math_nodes_tracing@tests.mps
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd
index 8d79c66cef0..39faddffafa 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ext.math.nodes_tracing" uuid="307598f2-bbfa-4d05-8e98-221d003ce000" moduleVersion="0" compileInMPS="true">
+<solution name="test.ext.math.nodes_tracing" uuid="307598f2-bbfa-4d05-8e98-221d003ce000" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">85e94e86-9fcb-43a2-9083-64c40006219e(com.mbeddr.mpsutil.nodes_tracing.test)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
@@ -47,7 +46,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_code.mps b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_code.mps
index 7ab8713a3ad..ea44a05c133 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_code.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_code.mps
@@ -59,7 +59,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -68,7 +68,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -150,7 +150,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -163,7 +163,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_nodes_tracing@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_nodes_tracing@tests.mps
index 6d3b6cce04c..32287c50f4a 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_nodes_tracing@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/models/sm_nodes_tracing@tests.mps
@@ -53,7 +53,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd
index 09f39abf04c..2dcc9bb787e 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ext.statemachine.nodes_tracing" uuid="ee6f777b-4776-4dc5-8ab5-cff0050a11eb" moduleVersion="0" compileInMPS="true">
+<solution name="test.ext.statemachine.nodes_tracing" uuid="ee6f777b-4776-4dc5-8ab5-cff0050a11eb" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">85e94e86-9fcb-43a2-9083-64c40006219e(com.mbeddr.mpsutil.nodes_tracing.test)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
@@ -48,7 +47,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/main@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/main@tests.mps
index 2e6f05d1e9b..14d3c81a9c9 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/main@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/main@tests.mps
@@ -22,7 +22,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -50,7 +50,7 @@
       <concept id="9172009453270379331" name="com.mbeddr.ext.components.embedded.structure.InterruptTrigger" flags="ng" index="3_ZiP3" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -87,7 +87,7 @@
         <property id="5952395988556102274" name="supportsSharedLibraries" index="uKT8v" />
       </concept>
       <concept id="5476261277774416029" name="com.mbeddr.core.buildconfig.structure.Win32" flags="ng" index="1l1LS3" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -101,7 +101,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -113,7 +113,7 @@
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -121,7 +121,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -145,7 +145,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -178,7 +178,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/modules.mps b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/modules.mps
index 11b7b34ed20..be5316e0e6a 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/modules.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/modules.mps
@@ -26,7 +26,7 @@
       <concept id="9172009453270379331" name="com.mbeddr.ext.components.embedded.structure.InterruptTrigger" flags="ng" index="3_ZiP3" />
     </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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -52,7 +52,7 @@
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
       <concept id="5308710777891716348" name="com.mbeddr.core.modules.structure.NoOp" flags="ng" index="EaqyJ" />
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -60,7 +60,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -79,7 +79,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -109,7 +109,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd
index ef6fb8e864b..2f5b86e9dac 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.ext.components.embedded" uuid="cc872c37-5126-4cea-bcc0-b45897eba581" moduleVersion="0" compileInMPS="true">
+<solution name="test.ts.ext.components.embedded" uuid="cc872c37-5126-4cea-bcc0-b45897eba581" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</dependency>
     <dependency reexport="false">028899e1-bfee-4db6-b470-ed0f9ee5f662(com.mbeddr.ext.components.embedded)</dependency>
@@ -52,7 +51,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -109,7 +108,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="cc872c37-5126-4cea-bcc0-b45897eba581(test.ts.ext.components.embedded)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd
index c55bdc8fa7c..6f799a667a4 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.ext.components" uuid="65b00399-c5df-4987-baee-fe04224907ff" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.ext.components" uuid="65b00399-c5df-4987-baee-fe04224907ff" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</dependency>
     <dependency reexport="false">54f2a59b-97bb-4c09-af92-928ebf9c5966(com.mbeddr.ext.compositecomponents)</dependency>
@@ -56,7 +55,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -116,7 +115,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="65b00399-c5df-4987-baee-fe04224907ff(test.ts.ext.components)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/models/test/ts/ext/components/basic@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/models/test/ts/ext/components/basic@tests.mps
index 34f71dc0bbf..7730117f620 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/models/test/ts/ext/components/basic@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/models/test/ts/ext/components/basic@tests.mps
@@ -40,7 +40,7 @@
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -86,7 +86,7 @@
         <reference id="6847490852648489303" name="metaUnit" index="3XRFRL" />
         <child id="6847490852648489203" name="specification" index="3XRFLl" />
       </concept>
-      <concept id="6847490852649574210" name="com.mbeddr.ext.units.structure.IGenericUnitMappingProvider" flags="ng" index="3XVjf$">
+      <concept id="6847490852649574210" name="com.mbeddr.ext.units.structure.IGenericUnitMappingProvider" flags="ngI" index="3XVjf$">
         <child id="6727518107535251210" name="unitMappings" index="1QYmkp" />
       </concept>
     </language>
@@ -95,7 +95,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -129,7 +129,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -225,7 +225,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -255,7 +255,7 @@
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -263,7 +263,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
         <property id="6708182213627106114" name="preventNameMangling" index="3mNxdG" />
       </concept>
@@ -305,7 +305,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -442,11 +442,11 @@
         <reference id="785275130114861598" name="field" index="3R_36f" />
         <child id="785275130114861599" name="value" index="3R_36e" />
       </concept>
-      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ng" index="3VxgRd">
+      <concept id="5703827575549009208" name="com.mbeddr.ext.components.structure.AbstractDataElementRefTarget" flags="ngI" index="3VxgRd">
         <reference id="5703827575549009244" name="element" index="3VxgQD" />
       </concept>
       <concept id="5703827575547552890" name="com.mbeddr.ext.components.structure.DataElementRefTarget" flags="ng" index="3VJJif" />
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
@@ -473,13 +473,13 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
       <concept id="22102029902365709" name="com.mbeddr.core.expressions.structure.AssignmentExpr" flags="ng" index="3pqW6w" />
       <concept id="3976803464656498416" name="com.mbeddr.core.expressions.structure.PostDecrementExpression" flags="ng" index="1FldXu" />
-      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ng" index="1Ml8iu">
+      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ngI" index="1Ml8iu">
         <child id="7336544617004013388" name="valueType" index="UxbcT" />
       </concept>
       <concept id="8860443239512147449" name="com.mbeddr.core.expressions.structure.LessExpression" flags="ng" index="3Tl9Jn" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/models/test/ts/ext/concurrency/tasks@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/models/test/ts/ext/concurrency/tasks@tests.mps
index e3f4644e0bc..a390e1f4eb5 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/models/test/ts/ext/concurrency/tasks@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/models/test/ts/ext/concurrency/tasks@tests.mps
@@ -25,7 +25,7 @@
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -50,7 +50,7 @@
         <child id="6275792049641600984" name="condition" index="c0U16" />
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="8850915533694634145" name="com.mbeddr.core.statements.structure.InitExpression" flags="ng" index="3o3WLD">
@@ -95,7 +95,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -126,7 +126,7 @@
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
         <child id="8375407818529178007" name="text" index="OjmMu" />
       </concept>
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -137,14 +137,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -166,7 +166,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -228,7 +228,7 @@
         <reference id="7468393218933864104" name="res" index="1uQ2qS" />
       </concept>
       <concept id="7468393218933745374" name="com.mbeddr.ext.concurrency.structure.ResourceDeclaration" flags="ng" index="1uRBre" />
-      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ng" index="1vwp$X">
+      <concept id="2491447282819596071" name="com.mbeddr.ext.concurrency.structure.IDeclaresTask" flags="ngI" index="1vwp$X">
         <property id="4932209942850825261" name="taskID" index="3_dPry" />
       </concept>
       <concept id="562973772910539128" name="com.mbeddr.ext.concurrency.structure.AwaitStatement" flags="ng" index="3JSqjh">
@@ -273,7 +273,7 @@
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd
index 0435b20cd4a..8813b4e0193 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.ext.concurrency" uuid="1150a9b6-68b1-44b7-a7e5-cba98fe879c1" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.ext.concurrency" uuid="1150a9b6-68b1-44b7-a7e5-cba98fe879c1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b879012d-402b-40e0-8df7-e6fa93b9b711(com.mbeddr.ext.concurrency)</dependency>
   </dependencies>
@@ -45,7 +44,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -100,7 +99,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="1150a9b6-68b1-44b7-a7e5-cba98fe879c1(test.ts.ext.concurrency)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/models/test/ts/ext/statemachine/smComp@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/models/test/ts/ext/statemachine/smComp@tests.mps
index 9ccd6800a4a..c1718bb44c1 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/models/test/ts/ext/statemachine/smComp@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/models/test/ts/ext/statemachine/smComp@tests.mps
@@ -20,7 +20,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -57,7 +57,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
         <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -73,7 +73,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -82,7 +82,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -116,7 +116,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -144,7 +144,7 @@
       <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
         <child id="7034214596252529803" name="target" index="1ESnxz" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd
index 51babec3f5a..ea2decc8212 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.ext.statemachine" uuid="0b9a87d4-c75d-4da2-9dee-ed15b5198e14" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.ext.statemachine" uuid="0b9a87d4-c75d-4da2-9dee-ed15b5198e14" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
   </dependencies>
@@ -53,7 +52,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
@@ -107,7 +106,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="0b9a87d4-c75d-4da2-9dee-ed15b5198e14(test.ts.ext.statemachine)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/models/test/ts/ext/units/main@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/models/test/ts/ext/units/main@tests.mps
index 69f29677218..3e7e4f8c998 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/models/test/ts/ext/units/main@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/models/test/ts/ext/units/main@tests.mps
@@ -15,7 +15,7 @@
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="5" />
     <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="6" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
   </languages>
   <imports>
     <import index="cmgk" ref="r:679066bc-2da8-4932-a09c-5d2b3d47b911(com.mbeddr.ext.units.siunits)" />
@@ -38,7 +38,7 @@
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -142,7 +142,7 @@
         <child id="6275792049641600985" name="thenPart" index="c0U17" />
         <child id="3134547887598486571" name="elsePart" index="ggAap" />
       </concept>
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="1494329074535282918" name="com.mbeddr.core.statements.structure.ElsePart" flags="ng" index="1ly_i6">
@@ -202,7 +202,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -215,7 +215,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -223,7 +223,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -231,7 +231,7 @@
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
+      <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ngI" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
       </concept>
       <concept id="5950410542643524492" name="com.mbeddr.core.modules.structure.FunctionCall" flags="ng" index="3O_q_g">
@@ -258,7 +258,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -281,7 +281,7 @@
       <concept id="5763383285156373018" name="com.mbeddr.core.expressions.structure.MinusExpression" flags="ng" index="2BOcil" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
       <concept id="5763383285156533447" name="com.mbeddr.core.expressions.structure.ParensExpression" flags="ng" index="2BPB98" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="3820836583575227340" name="com.mbeddr.core.expressions.structure.DirectPlusAssignmentExpression" flags="ng" index="TPXPH" />
@@ -296,7 +296,7 @@
       <concept id="9013371069686136255" name="com.mbeddr.core.expressions.structure.BitwiseLeftShiftExpression" flags="ng" index="3oul24" />
       <concept id="9013371069685947728" name="com.mbeddr.core.expressions.structure.BitwiseRightShiftExpression" flags="ng" index="3ov31F" />
       <concept id="4739982148980385695" name="com.mbeddr.core.expressions.structure.FloatType" flags="ng" index="3AreGT" />
-      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ng" index="1Ml8iu">
+      <concept id="743779816742251347" name="com.mbeddr.core.expressions.structure.ITypeDecorator" flags="ngI" index="1Ml8iu">
         <child id="7336544617004013388" name="valueType" index="UxbcT" />
       </concept>
       <concept id="8860443239512129322" name="com.mbeddr.core.expressions.structure.EqualsExpression" flags="ng" index="3TlM44" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd
index 9012733a545..ca7d79cf408 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.ext.units" uuid="3e91b33c-9c18-4307-9388-e5d6e8b6ef30" moduleVersion="0" pluginKind="PLUGIN_CORE" compileInMPS="true">
+<solution name="test.ts.ext.units" uuid="3e91b33c-9c18-4307-9388-e5d6e8b6ef30" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0d04a6cc-773e-4069-b9b0-11884b2ff1c8(com.mbeddr.ext.units)</dependency>
     <dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
@@ -36,11 +35,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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -93,7 +92,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="3e91b33c-9c18-4307-9388-e5d6e8b6ef30(test.ts.ext.units)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.mpsutil/.mps/migration.xml b/code/languages/com.mbeddr.mpsutil/.mps/migration.xml
index 273d8e8a3ee..65112394c89 100644
--- a/code/languages/com.mbeddr.mpsutil/.mps/migration.xml
+++ b/code/languages/com.mbeddr.mpsutil/.mps/migration.xml
@@ -20,6 +20,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -28,6 +30,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/EcoreImporter_TestLanguage1.mpl b/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/EcoreImporter_TestLanguage1.mpl
index 0e675ffe806..6fa83dc14d0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/EcoreImporter_TestLanguage1.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/EcoreImporter_TestLanguage1.mpl
@@ -11,13 +11,12 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps
index 993efa2e91f..2e3d4b0bfa7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps
@@ -76,7 +76,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 8a160574beb..a418e0ea4d8 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
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -55,12 +55,11 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps
index 97ecb348e5b..71b83b4dfda 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps
@@ -87,7 +87,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps
index ee7792a15e4..0348188ae75 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps
@@ -41,7 +41,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps
index a045ff271f6..d1f02db1bb3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps
@@ -31,7 +31,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/com.mbeddr.mpsutil.actionsfilter.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/com.mbeddr.mpsutil.actionsfilter.mpl
index 14e8b91ea0f..37052b742a3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/com.mbeddr.mpsutil.actionsfilter.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/com.mbeddr.mpsutil.actionsfilter.mpl
@@ -34,7 +34,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -42,7 +42,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
         <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
@@ -76,7 +76,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
@@ -95,7 +94,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps
index b9e83471d3b..afdeebdb2ea 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps
@@ -106,7 +106,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -119,7 +119,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -181,6 +181,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -194,7 +195,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -234,7 +235,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -932,7 +933,7 @@
                             </node>
                             <node concept="2OqwBi" id="IuB3xAAE5t" role="3uHU7B">
                               <node concept="37vLTw" id="IuB3xAAE5u" role="2Oq$k0">
-                                <ref role="3cqZAo" node="IuB3xAAE5w" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skP2" resolve="it" />
                               </node>
                               <node concept="liA8E" id="IuB3xAAE5v" role="2OqNvi">
                                 <ref role="37wK5l" to="ykkq:3NH93czh2D0" resolve="getName" />
@@ -941,9 +942,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="IuB3xAAE5w" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skP2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="IuB3xAAE5x" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skP3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1258,15 +1259,15 @@
                       <node concept="liA8E" id="1_Ri$6xyg2Q" role="2OqNvi">
                         <ref role="37wK5l" to="ykkq:1_Ri$6xxdPQ" resolve="unregister" />
                         <node concept="37vLTw" id="1_Ri$6xyg5u" role="37wK5m">
-                          <ref role="3cqZAo" node="1_Ri$6xyfzS" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skP4" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1_Ri$6xyfzS" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skP4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1_Ri$6xyfzT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skP5" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps
index 19afe841d43..cdb52f58ccd 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps
@@ -8,9 +8,9 @@
   <imports>
     <import index="ykkq" ref="r:7171fd48-62d6-4c67-ab22-d7d6b8fa4653(com.mbeddr.mpsutil.actionsfilter.runtime)" />
     <import index="au0v" ref="r:ae24f9b4-2210-4864-8fbf-79fb5fb02754(com.mbeddr.mpsutil.actionsfilter.structure)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -90,7 +90,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,13 +102,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -150,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -170,7 +171,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -241,7 +241,7 @@
                     <node concept="3clFbF" id="5ARcp1btCX1" role="3cqZAp">
                       <node concept="2OqwBi" id="5ARcp1btCX2" role="3clFbG">
                         <node concept="37vLTw" id="5ARcp1btCX3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5ARcp1btCX5" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skOB" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="5Vrdhqqt2b1" role="2OqNvi">
                           <ref role="3TsBF5" to="au0v:5ReuVUpc9R6" resolve="actionId" />
@@ -249,9 +249,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5ARcp1btCX5" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skOB" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5ARcp1btCX6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skOC" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -280,16 +280,16 @@
                           </node>
                           <node concept="3JPx81" id="5ARcp1btOux" role="2OqNvi">
                             <node concept="37vLTw" id="5ARcp1btOuy" role="25WWJ7">
-                              <ref role="3cqZAo" node="5ARcp1btOuz" resolve="it" />
+                              <ref role="3cqZAo" node="7chCMJ_skOD" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5ARcp1btOuz" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skOD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5ARcp1btOu$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skOE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -322,7 +322,7 @@
                   <node concept="3clFbF" id="32cN67Edm4K" role="3cqZAp">
                     <node concept="37vLTI" id="32cN67Edm4L" role="3clFbG">
                       <node concept="37vLTw" id="32cN67EdmEg" role="37vLTx">
-                        <ref role="3cqZAo" node="32cN67Edm2x" resolve="it" />
+                        <ref role="3cqZAo" node="7chCMJ_skOF" resolve="it" />
                       </node>
                       <node concept="2OqwBi" id="32cN67Edm4N" role="37vLTJ">
                         <node concept="37vLTw" id="32cN67Edm4O" role="2Oq$k0">
@@ -340,9 +340,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="32cN67Edm2x" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skOF" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="32cN67Edm2y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skOG" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -491,29 +491,6 @@
       <node concept="3clFbS" id="5ReuVUpd_x1" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="2jUI4_LR4Qq">
-    <ref role="13h7C2" to="au0v:2jUI4_LQRKG" resolve="ConceptFunction_ApplicationInfo" />
-    <node concept="13hLZK" id="2jUI4_LR4Qr" role="13h7CW">
-      <node concept="3clFbS" id="2jUI4_LR4Qs" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="2jUI4_LR4Q_" role="13h7CS">
-      <property role="TrG5h" value="getType" />
-      <ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
-      <node concept="3Tm1VV" id="2jUI4_LR4QA" role="1B3o_S" />
-      <node concept="3clFbS" id="2jUI4_LR4QF" role="3clF47">
-        <node concept="3clFbF" id="2jUI4_LR4Zw" role="3cqZAp">
-          <node concept="2c44tf" id="2jUI4_LR5b4" role="3clFbG">
-            <node concept="3uibUv" id="2jUI4_LR5d3" role="2c44tc">
-              <ref role="3uigEE" to="bd8o:~ApplicationInfo" resolve="ApplicationInfo" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2jUI4_LR4QG" role="3clF45">
-        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
-      </node>
-    </node>
-  </node>
   <node concept="13h7C7" id="2jUI4_LQMcJ">
     <ref role="13h7C2" to="au0v:2jUI4_LQLA2" resolve="ActivationCondition" />
     <node concept="13hLZK" id="2jUI4_LQMcK" role="13h7CW">
@@ -579,6 +556,29 @@
       <node concept="3Tqbb2" id="2jUI4_LQMd1" role="3clF45" />
     </node>
   </node>
+  <node concept="13h7C7" id="2jUI4_LR4Qq">
+    <ref role="13h7C2" to="au0v:2jUI4_LQRKG" resolve="ConceptFunction_ApplicationInfo" />
+    <node concept="13hLZK" id="2jUI4_LR4Qr" role="13h7CW">
+      <node concept="3clFbS" id="2jUI4_LR4Qs" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="2jUI4_LR4Q_" role="13h7CS">
+      <property role="TrG5h" value="getType" />
+      <ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
+      <node concept="3Tm1VV" id="2jUI4_LR4QA" role="1B3o_S" />
+      <node concept="3clFbS" id="2jUI4_LR4QF" role="3clF47">
+        <node concept="3clFbF" id="2jUI4_LR4Zw" role="3cqZAp">
+          <node concept="2c44tf" id="2jUI4_LR5b4" role="3clFbG">
+            <node concept="3uibUv" id="2jUI4_LR5d3" role="2c44tc">
+              <ref role="3uigEE" to="bd8o:~ApplicationInfo" resolve="ApplicationInfo" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2jUI4_LR4QG" role="3clF45">
+        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+      </node>
+    </node>
+  </node>
   <node concept="13h7C7" id="5wANKxaV9gi">
     <property role="3GE5qa" value="toolBar" />
     <ref role="13h7C2" to="au0v:6nrtUqYelxV" resolve="ToolBarAction" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/constraints.mps
index 790af3c8c3e..e5f13d04b63 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/constraints.mps
@@ -23,7 +23,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/editor.mps
index 9955db704f6..f5be6eed486 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/editor.mps
@@ -105,7 +105,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -135,7 +135,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -242,7 +242,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -260,7 +260,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -279,6 +279,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -320,7 +321,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -337,7 +338,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -1549,7 +1549,7 @@
                                         <node concept="3clFbF" id="7LkwBl9K8vg" role="3cqZAp">
                                           <node concept="2OqwBi" id="7LkwBl9K9Am" role="3clFbG">
                                             <node concept="37vLTw" id="7LkwBl9K8vf" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7LkwBl9K7lE" resolve="it" />
+                                              <ref role="3cqZAo" node="7chCMJ_skOH" resolve="it" />
                                             </node>
                                             <node concept="2qgKlT" id="5ReuVUpdPpa" role="2OqNvi">
                                               <ref role="37wK5l" to="jm5d:5ReuVUpdzR3" resolve="refersToActionId" />
@@ -1560,9 +1560,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="7LkwBl9K7lE" role="1bW2Oz">
+                                      <node concept="gl6BB" id="7chCMJ_skOH" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="7LkwBl9K7lF" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="7chCMJ_skOI" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1955,7 +1955,7 @@
                     <node concept="3clFbF" id="7LkwBl9JSYi" role="3cqZAp">
                       <node concept="2OqwBi" id="5ReuVUpe38j" role="3clFbG">
                         <node concept="37vLTw" id="5ReuVUpe38k" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7LkwBl9JSUy" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skOJ" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5ReuVUpe38l" role="2OqNvi">
                           <ref role="37wK5l" to="jm5d:5ReuVUpdzR3" resolve="refersToActionId" />
@@ -1966,9 +1966,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7LkwBl9JSUy" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skOJ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7LkwBl9JSUz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skOK" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2033,21 +2033,21 @@
                               <node concept="3clFbF" id="7LkwBl9G8YX" role="3cqZAp">
                                 <node concept="1Ls8ON" id="7LkwBl9G8YW" role="3clFbG">
                                   <node concept="37vLTw" id="7LkwBl9G9xi" role="1Lso8e">
-                                    <ref role="3cqZAo" node="7LkwBl9G8G2" resolve="it" />
+                                    <ref role="3cqZAo" node="7chCMJ_skOL" resolve="it" />
                                   </node>
                                   <node concept="2YIFZM" id="7LkwBl9GvUh" role="1Lso8e">
                                     <ref role="1Pybhc" to="ykkq:4JPDo_GOOui" resolve="ActionHacks" />
                                     <ref role="37wK5l" to="ykkq:7LkwBl9GcsX" resolve="getActionText" />
                                     <node concept="37vLTw" id="7LkwBl9GwgF" role="37wK5m">
-                                      <ref role="3cqZAo" node="7LkwBl9G8G2" resolve="it" />
+                                      <ref role="3cqZAo" node="7chCMJ_skOL" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7LkwBl9G8G2" role="1bW2Oz">
+                            <node concept="gl6BB" id="7chCMJ_skOL" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7LkwBl9G8G3" role="1tU5fm" />
+                              <node concept="2jxLKc" id="7chCMJ_skOM" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2063,15 +2063,15 @@
                                     <property role="3cmrfH" value="1" />
                                   </node>
                                   <node concept="37vLTw" id="7LkwBl9Gzw1" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="7LkwBl9Gz6a" resolve="it" />
+                                    <ref role="3cqZAo" node="7chCMJ_skON" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7LkwBl9Gz6a" role="1bW2Oz">
+                          <node concept="gl6BB" id="7chCMJ_skON" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7LkwBl9Gz6b" role="1tU5fm" />
+                            <node concept="2jxLKc" id="7chCMJ_skOO" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2163,21 +2163,21 @@
                               <node concept="3clFbF" id="5ReuVUpcabq" role="3cqZAp">
                                 <node concept="1Ls8ON" id="5ReuVUpcabr" role="3clFbG">
                                   <node concept="37vLTw" id="5ReuVUpcabs" role="1Lso8e">
-                                    <ref role="3cqZAo" node="5ReuVUpcabv" resolve="it" />
+                                    <ref role="3cqZAo" node="7chCMJ_skOP" resolve="it" />
                                   </node>
                                   <node concept="2YIFZM" id="5ReuVUpcabt" role="1Lso8e">
                                     <ref role="1Pybhc" to="ykkq:4JPDo_GOOui" resolve="ActionHacks" />
                                     <ref role="37wK5l" to="ykkq:7LkwBl9GcsX" resolve="getActionText" />
                                     <node concept="37vLTw" id="5ReuVUpcabu" role="37wK5m">
-                                      <ref role="3cqZAo" node="5ReuVUpcabv" resolve="it" />
+                                      <ref role="3cqZAo" node="7chCMJ_skOP" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5ReuVUpcabv" role="1bW2Oz">
+                            <node concept="gl6BB" id="7chCMJ_skOP" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5ReuVUpcabw" role="1tU5fm" />
+                              <node concept="2jxLKc" id="7chCMJ_skOQ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2193,15 +2193,15 @@
                                     <property role="3cmrfH" value="1" />
                                   </node>
                                   <node concept="37vLTw" id="5ReuVUpcabD" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="5ReuVUpcabE" resolve="it" />
+                                    <ref role="3cqZAo" node="7chCMJ_skOR" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5ReuVUpcabE" role="1bW2Oz">
+                          <node concept="gl6BB" id="7chCMJ_skOR" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5ReuVUpcabF" role="1tU5fm" />
+                            <node concept="2jxLKc" id="7chCMJ_skOS" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2302,21 +2302,21 @@
                               <node concept="3clFbF" id="6nrtUqYnbEV" role="3cqZAp">
                                 <node concept="1Ls8ON" id="6nrtUqYnbEW" role="3clFbG">
                                   <node concept="37vLTw" id="6nrtUqYnbEX" role="1Lso8e">
-                                    <ref role="3cqZAo" node="6nrtUqYnbF0" resolve="it" />
+                                    <ref role="3cqZAo" node="7chCMJ_skOT" resolve="it" />
                                   </node>
                                   <node concept="2YIFZM" id="6nrtUqYnbEY" role="1Lso8e">
                                     <ref role="37wK5l" to="ykkq:7LkwBl9GcsX" resolve="getActionText" />
                                     <ref role="1Pybhc" to="ykkq:4JPDo_GOOui" resolve="ActionHacks" />
                                     <node concept="37vLTw" id="6nrtUqYnbEZ" role="37wK5m">
-                                      <ref role="3cqZAo" node="6nrtUqYnbF0" resolve="it" />
+                                      <ref role="3cqZAo" node="7chCMJ_skOT" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6nrtUqYnbF0" role="1bW2Oz">
+                            <node concept="gl6BB" id="7chCMJ_skOT" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6nrtUqYnbF1" role="1tU5fm" />
+                              <node concept="2jxLKc" id="7chCMJ_skOU" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2332,15 +2332,15 @@
                                     <property role="3cmrfH" value="1" />
                                   </node>
                                   <node concept="37vLTw" id="6nrtUqYnbFa" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="6nrtUqYnbFb" resolve="it" />
+                                    <ref role="3cqZAo" node="7chCMJ_skOV" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6nrtUqYnbFb" role="1bW2Oz">
+                          <node concept="gl6BB" id="7chCMJ_skOV" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6nrtUqYnbFc" role="1tU5fm" />
+                            <node concept="2jxLKc" id="7chCMJ_skOW" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/intentions.mps
index 75dd48ea8f9..580502faa1c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/intentions.mps
@@ -67,7 +67,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -77,6 +77,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -119,7 +120,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -140,7 +141,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
@@ -332,7 +332,7 @@
                           </node>
                           <node concept="tyxLq" id="6nN17YWJMzj" role="2OqNvi">
                             <node concept="37vLTw" id="6nN17YWJMNn" role="tz02z">
-                              <ref role="3cqZAo" node="6nN17YWJE4G" resolve="it" />
+                              <ref role="3cqZAo" node="7chCMJ_skOX" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -355,7 +355,7 @@
                     </node>
                     <node concept="2OqwBi" id="3m_Gngiqja2" role="3clFbw">
                       <node concept="37vLTw" id="3m_Gngiqino" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6nN17YWJE4G" resolve="it" />
+                        <ref role="3cqZAo" node="7chCMJ_skOX" resolve="it" />
                       </node>
                       <node concept="17RvpY" id="3m_GngiqjA_" role="2OqNvi" />
                     </node>
@@ -384,9 +384,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6nN17YWJE4G" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skOX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6nN17YWJE4H" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skOY" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/structure.mps
index 7dcd31de649..42055ff3ed6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/structure.mps
@@ -49,7 +49,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/typesystem.mps
index 57d0931b151..3c6934a1f05 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/typesystem.mps
@@ -30,7 +30,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -66,7 +66,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/com.mbeddr.mpsutil.asynccell.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/com.mbeddr.mpsutil.asynccell.sandbox.mpl
index c7170574da6..66bedc9a3f8 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/com.mbeddr.mpsutil.asynccell.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/com.mbeddr.mpsutil.asynccell.sandbox.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0381a253-2986-4e29-bd38-bdda504095e5(com.mbeddr.mpsutil.asynccell)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps
index 8d367ab8766..eb0389c3ce3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps
@@ -99,7 +99,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -119,7 +119,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -139,7 +139,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps
index f1263001e7c..195efe2863d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps
@@ -51,7 +51,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1176474535556" name="jetbrains.mps.lang.editor.structure.QueryFunction_JComponent" flags="in" index="3Fmcul" />
@@ -126,7 +126,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -138,7 +138,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -156,7 +156,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/structure.mps
index c3b75a2afea..2d2c52c8236 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/structure.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl
index cdd0247c263..ce1d9efc272 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/constraints.mps
index 229dd6565ce..4b94d86f39d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/constraints.mps
@@ -41,7 +41,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -83,7 +83,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/editor.mps
index 43e0f57ce38..58469297c64 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/editor.mps
@@ -65,7 +65,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -180,7 +180,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -197,7 +197,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="3066917033203108594" name="jetbrains.mps.baseLanguage.structure.LocalInstanceMethodCall" flags="nn" index="3P9mCS" />
@@ -224,7 +224,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/intentions.mps
index ad04a600abd..d6d8d2dfe21 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/intentions.mps
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/structure.mps
index 98677690509..2651c6ee445 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/languageModels/structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/com.mbeddr.mpsutil.blutil.test.waitfor.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/com.mbeddr.mpsutil.blutil.test.waitfor.mpl
index 201289afd53..63d025db556 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/com.mbeddr.mpsutil.blutil.test.waitfor.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/com.mbeddr.mpsutil.blutil.test.waitfor.mpl
@@ -32,7 +32,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -66,7 +66,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
     <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
@@ -76,7 +75,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/generator/template/main@generator.mps
index 68cc032dcf6..d3b5e788ce2 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/generator/template/main@generator.mps
@@ -97,7 +97,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -137,7 +137,7 @@
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -191,7 +191,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/editor.mps
index 09cd4e08a19..e1cc1942437 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/editor.mps
@@ -37,7 +37,7 @@
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -51,7 +51,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/structure.mps
index 92cbacee726..ad95c324589 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil.test.waitfor/models/structure.mps
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/com.mbeddr.mpsutil.ccmenu.reftarget.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/com.mbeddr.mpsutil.ccmenu.reftarget.mpl
index b81ef3598f1..d6f0cdb9c8c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/com.mbeddr.mpsutil.ccmenu.reftarget.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/com.mbeddr.mpsutil.ccmenu.reftarget.mpl
@@ -36,7 +36,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -91,7 +91,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3ab9bd46-be60-4c45-806b-37a5b96358a2(com.mbeddr.mpsutil.ccmenu.reftarget.runtime)</dependency>
     <dependency reexport="false">f92af8d7-1fae-4067-8109-17acf80f8e58(com.mbeddr.mpsutil.ccmenu.reftarget)</dependency>
@@ -102,7 +101,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/generator/template/main@generator.mps
index b9c32b1e52c..c0e23a76ce2 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/generator/template/main@generator.mps
@@ -34,7 +34,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -101,7 +101,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -118,7 +118,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -236,7 +236,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/behavior.mps
index 31e2adadc59..8c42ea6b09a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/behavior.mps
@@ -56,13 +56,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
       <concept id="1196350785117" name="jetbrains.mps.lang.quotation.structure.ReferenceAntiquotation" flags="ng" index="2c44tb" />
@@ -103,7 +103,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/editor.mps
index 0e802bca664..c8ca525c6ff 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/editor.mps
@@ -61,7 +61,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/structure.mps
index 1e72806720e..d2283b3b2f3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.reftarget/models/structure.mps
@@ -38,7 +38,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/com.mbeddr.mpsutil.ccmenu.sandboxlang.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/com.mbeddr.mpsutil.ccmenu.sandboxlang.mpl
index 4a99bff4ab8..92b0802935c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/com.mbeddr.mpsutil.ccmenu.sandboxlang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/com.mbeddr.mpsutil.ccmenu.sandboxlang.mpl
@@ -28,7 +28,7 @@
         <language slang="l:7369078b-42c2-46a1-a2d6-4e4224650944:com.mbeddr.mpsutil.ccmenu.sandboxlang" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -53,7 +53,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">bc20ac0c-ee07-4313-9d3e-cd7cd23e1920(com.mbeddr.mpsutil.ccmenu.runtime)</dependency>
@@ -64,7 +63,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -82,7 +81,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/generator/template/main@generator.mps
index 3e34a0a17e3..72ddd19f8ec 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/generator/template/main@generator.mps
@@ -21,7 +21,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/editor.mps
index 0c6ba2fb838..20e2e34058f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/editor.mps
@@ -16,7 +16,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -27,7 +27,7 @@
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
@@ -41,7 +41,7 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -70,7 +70,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -105,7 +105,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/plugin.mps
index 5d76a47b014..f310c681f17 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:3e903662-5bcd-43fc-ab47-08484d7b5257(com.mbeddr.mpsutil.ccmenu.sandboxlang.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="935bff03-e393-4547-a3a2-60335e0cad25" name="com.mbeddr.mpsutil.ccmenu" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -40,7 +40,7 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -63,6 +63,7 @@
       <concept id="490620444044280921" name="com.mbeddr.mpsutil.ccmenu.structure.Sorter_Entries" flags="ng" index="300GNC" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -72,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -88,7 +89,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -114,7 +114,7 @@
                           <node concept="2OqwBi" id="1uZEtAijAGF" role="3clFbG">
                             <node concept="2OqwBi" id="1uZEtAij$O5" role="2Oq$k0">
                               <node concept="37vLTw" id="1uZEtAij$IA" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1uZEtAijz$A" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2lr" resolve="it" />
                               </node>
                               <node concept="liA8E" id="1uZEtAij_IJ" role="2OqNvi">
                                 <ref role="37wK5l" to="65ig:1uZEtAij__3" resolve="getMatchingText" />
@@ -126,9 +126,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1uZEtAijz$A" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2lr" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1uZEtAijz$B" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2ls" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="1nlBCl" id="1uZEtAijBmp" role="2S7zOq">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/structure.mps
index 30a907dd21a..30e913ee8e2 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/models/structure.mps
@@ -33,7 +33,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.mpl
index 3c8e446aa29..47ac823f301 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.mpl
@@ -31,7 +31,7 @@
         <language slang="l:935bff03-e393-4547-a3a2-60335e0cad25:com.mbeddr.mpsutil.ccmenu" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -66,7 +66,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -79,7 +78,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/generator/template/main@generator.mps
index ddd9f13c321..b8a10fde805 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/generator/template/main@generator.mps
@@ -29,7 +29,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -100,7 +100,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -114,7 +114,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -230,7 +230,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/behavior.mps
index d44a9e287c9..ebd736f1f7d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/behavior.mps
@@ -53,7 +53,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -75,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/editor.mps
index c64573d5971..9001ff4ef35 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/editor.mps
@@ -51,7 +51,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/structure.mps
index eea612ad811..691c91df91f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/models/structure.mps
@@ -34,7 +34,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/com.mbeddr.mpsutil.compare.pattern.baselang.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/com.mbeddr.mpsutil.compare.pattern.baselang.mpl
index 3ec77c181c2..48a28cdc8e2 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/com.mbeddr.mpsutil.compare.pattern.baselang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/com.mbeddr.mpsutil.compare.pattern.baselang.mpl
@@ -32,7 +32,7 @@
         <language slang="l:36590f48-d68b-4c16-bfba-c769260bbac0:com.mbeddr.mpsutil.compare.pattern.baselang" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -85,7 +85,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">17566462-d837-4552-874c-64e45c10778a(com.mbeddr.mpsutil.compare.pattern)</dependency>
@@ -97,7 +96,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/generator/template/main@generator.mps
index 785c3b3e446..18d72296be6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/generator/template/main@generator.mps
@@ -75,7 +75,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -87,7 +87,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -173,7 +173,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/behavior.mps
index fc3f11e82ae..845b736a899 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/behavior.mps
@@ -72,7 +72,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -82,7 +82,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/constraints.mps
index a80609e4999..255cee36dd6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/constraints.mps
@@ -82,7 +82,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -122,6 +122,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -181,7 +182,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -210,7 +211,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -519,7 +519,7 @@
                         <node concept="2OqwBi" id="2lop6rSg4OK" role="3clFbG">
                           <node concept="2OqwBi" id="2lop6rSg4OL" role="2Oq$k0">
                             <node concept="37vLTw" id="2lop6rSg4OM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSg4OP" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2lu" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2lop6rSg4ON" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -529,9 +529,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2lop6rSg4OP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2lu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2lop6rSg4OQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2lv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -691,7 +691,7 @@
                         <node concept="2OqwBi" id="2lop6rSg4SW" role="3clFbG">
                           <node concept="2OqwBi" id="2lop6rSg4SX" role="2Oq$k0">
                             <node concept="37vLTw" id="2lop6rSg4SY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSg4T1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2lw" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2lop6rSg4SZ" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -701,9 +701,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2lop6rSg4T1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2lw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2lop6rSg4T2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2lx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/editor.mps
index 214b5c57c7c..7e43d667ffd 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/editor.mps
@@ -52,10 +52,10 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -78,7 +78,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -104,11 +104,11 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -120,7 +120,7 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -185,7 +185,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -217,7 +217,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/structure.mps
index 78734ef64c5..76e1089345c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/structure.mps
@@ -43,7 +43,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/typesystem.mps
index b2c45262862..77681dfa101 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.baselang/models/typesystem.mps
@@ -67,7 +67,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -169,7 +169,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/com.mbeddr.mpsutil.compare.pattern.generator.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/com.mbeddr.mpsutil.compare.pattern.generator.mpl
index 68ca328a910..d57ee0e12f5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/com.mbeddr.mpsutil.compare.pattern.generator.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/com.mbeddr.mpsutil.compare.pattern.generator.mpl
@@ -36,7 +36,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -94,7 +94,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
@@ -107,7 +106,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/generator/template/main@generator.mps
index 261257cf821..cb1144bcf83 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/generator/template/main@generator.mps
@@ -83,7 +83,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,7 +95,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -113,7 +113,7 @@
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
@@ -133,7 +133,7 @@
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ngI" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
@@ -146,6 +146,7 @@
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -200,7 +201,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -208,7 +209,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -239,7 +239,7 @@
                               <node concept="2OqwBi" id="6Clmpmug4LK" role="2Oq$k0">
                                 <node concept="1PxgMI" id="6Clmpmug4LL" role="2Oq$k0">
                                   <node concept="37vLTw" id="6Clmpmug4LM" role="1m5AlR">
-                                    <ref role="3cqZAo" node="6Clmpmug4LU" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2lA" resolve="it" />
                                   </node>
                                   <node concept="chp4Y" id="1SbcsM_ILoy" role="3oSUPX">
                                     <ref role="cht4Q" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
@@ -259,7 +259,7 @@
                             </node>
                             <node concept="2OqwBi" id="6Clmpmug4LQ" role="3uHU7B">
                               <node concept="37vLTw" id="6Clmpmug4LR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Clmpmug4LU" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2lA" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6Clmpmug4LS" role="2OqNvi">
                                 <node concept="chp4Y" id="6Clmpmug4LT" role="cj9EA">
@@ -270,9 +270,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Clmpmug4LU" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2lA" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Clmpmug4LV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2lB" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -439,7 +439,7 @@
                               <node concept="2OqwBi" id="6Clmpmug9OO" role="2Oq$k0">
                                 <node concept="1PxgMI" id="6Clmpmug9OP" role="2Oq$k0">
                                   <node concept="37vLTw" id="6Clmpmug9OQ" role="1m5AlR">
-                                    <ref role="3cqZAo" node="6Clmpmug9OY" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2lC" resolve="it" />
                                   </node>
                                   <node concept="chp4Y" id="1SbcsM_ILo_" role="3oSUPX">
                                     <ref role="cht4Q" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
@@ -459,7 +459,7 @@
                             </node>
                             <node concept="2OqwBi" id="6Clmpmug9OU" role="3uHU7B">
                               <node concept="37vLTw" id="6Clmpmug9OV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Clmpmug9OY" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2lC" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6Clmpmug9OW" role="2OqNvi">
                                 <node concept="chp4Y" id="6Clmpmug9OX" role="cj9EA">
@@ -470,9 +470,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Clmpmug9OY" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2lC" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Clmpmug9OZ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2lD" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/behavior.mps
index 19e0b586ec4..a506d7acc3a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/behavior.mps
@@ -41,7 +41,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -50,7 +50,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/constraints.mps
index cd911a9a956..7650797784e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/constraints.mps
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/editor.mps
index 253cf613beb..f4dd772b426 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/editor.mps
@@ -28,7 +28,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -44,7 +44,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/structure.mps
index 9ad7f555c2a..dbd02ce3d0b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/structure.mps
@@ -33,7 +33,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/typesystem.mps
index 6581c2506ee..3022bcf372b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern.generator/models/typesystem.mps
@@ -74,6 +74,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -180,7 +181,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -188,7 +189,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225730411176" name="jetbrains.mps.baseLanguage.collections.structure.FindLastOperation" flags="nn" index="1zesIP" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -398,7 +398,7 @@
                           <node concept="3fqX7Q" id="6ClmpmueHqd" role="3uHU7w">
                             <node concept="2OqwBi" id="6ClmpmueHqe" role="3fr31v">
                               <node concept="37vLTw" id="6ClmpmueHqf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6ClmpmueHqp" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2lz" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6ClmpmueHqg" role="2OqNvi">
                                 <node concept="chp4Y" id="6ClmpmueHqh" role="cj9EA">
@@ -411,7 +411,7 @@
                             <node concept="2OqwBi" id="6ClmpmueHqj" role="3fr31v">
                               <node concept="2OqwBi" id="6ClmpmueHqk" role="2Oq$k0">
                                 <node concept="37vLTw" id="6ClmpmueHql" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6ClmpmueHqp" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2lz" resolve="it" />
                                 </node>
                                 <node concept="2yIwOk" id="6ClmpmueHqm" role="2OqNvi" />
                               </node>
@@ -425,9 +425,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6ClmpmueHqp" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2lz" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6ClmpmueHqq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2l$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/com.mbeddr.mpsutil.compare.pattern.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/com.mbeddr.mpsutil.compare.pattern.mpl
index 009c3e5dc10..710c820725a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/com.mbeddr.mpsutil.compare.pattern.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/com.mbeddr.mpsutil.compare.pattern.mpl
@@ -33,7 +33,7 @@
         <language slang="l:17566462-d837-4552-874c-64e45c10778a:com.mbeddr.mpsutil.compare.pattern" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -82,7 +82,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">3a13115c-633c-4c5c-bbcc-75c4219e9555(jetbrains.mps.lang.quotation)</dependency>
@@ -96,7 +95,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/generator/template/main@generator.mps
index 07e5ade59bb..ccbaadb8ccf 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/generator/template/main@generator.mps
@@ -85,7 +85,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -101,7 +101,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -216,7 +216,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/behavior.mps
index 4134020fdd7..90858ed218e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/behavior.mps
@@ -51,7 +51,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -121,7 +121,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -138,7 +138,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -195,7 +195,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/com.mbeddr.mpsutil.compare.pattern.enumMigration.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/com.mbeddr.mpsutil.compare.pattern.enumMigration.mps
index 17be8be4c6f..8bc7ac7f898 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/com.mbeddr.mpsutil.compare.pattern.enumMigration.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/com.mbeddr.mpsutil.compare.pattern.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/constraints.mps
index 7d08c2c64bb..d31bc40fe69 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/constraints.mps
@@ -47,7 +47,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/dataFlow.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/dataFlow.mps
index a2fa1c6473b..6034081b722 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/dataFlow.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/dataFlow.mps
@@ -31,6 +31,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -59,7 +60,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -68,7 +69,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="3_zdsH" id="d5uH5c0JcL">
@@ -121,13 +121,13 @@
                 <node concept="3clFbS" id="d5uH5c0NxW" role="1bW5cS">
                   <node concept="3AgYrR" id="d5uH5c0NzG" role="3cqZAp">
                     <node concept="37vLTw" id="d5uH5c0N_1" role="3Ah4Yx">
-                      <ref role="3cqZAo" node="d5uH5c0NxX" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN2lE" resolve="it" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="d5uH5c0NxX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2lE" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="d5uH5c0NxY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2lF" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -170,13 +170,13 @@
                 <node concept="3clFbS" id="d5uH5c0TZs" role="1bW5cS">
                   <node concept="3AgYrR" id="d5uH5c0U1U" role="3cqZAp">
                     <node concept="37vLTw" id="d5uH5c0U3R" role="3Ah4Yx">
-                      <ref role="3cqZAo" node="d5uH5c0TZt" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN2lG" resolve="it" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="d5uH5c0TZt" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2lG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="d5uH5c0TZu" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2lH" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/editor.mps
index 15b58515e3f..a5753b6853c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/editor.mps
@@ -56,7 +56,7 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -79,7 +79,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -109,7 +109,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -157,7 +157,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -200,7 +200,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/intentions.mps
index 22866e04f57..e2ee61165a7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/intentions.mps
@@ -76,7 +76,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -136,7 +136,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps
index 38ea4a3cc79..db5a4bb773d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps
@@ -89,7 +89,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/typesystem.mps
index 0e9aabfbd48..620a4d87899 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/typesystem.mps
@@ -79,7 +79,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -89,6 +89,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -206,7 +207,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -239,7 +240,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -763,15 +763,15 @@
                   <node concept="mw_s8" id="76efOMRDyb8" role="1ZfhK$">
                     <node concept="1Z2H0r" id="76efOMRDyaK" role="mwGJk">
                       <node concept="37vLTw" id="2BHiRxglKWJ" role="1Z2MuG">
-                        <ref role="3cqZAo" node="76efOMRDy9Q" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2lI" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="76efOMRDy9Q" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2lI" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="76efOMRDy9R" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2lJ" role="1tU5fm" />
               </node>
             </node>
           </node>
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 18845509b80..381f644a772 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
@@ -41,7 +41,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -100,7 +100,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)</dependency>
     <dependency reexport="false" scope="generate-into">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
@@ -112,7 +111,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps
index d83fda52ae3..b9c9ed40219 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps
@@ -67,7 +67,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,7 +78,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -95,7 +95,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/constraints.mps
index bbb1e233508..d66e457db2c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/constraints.mps
@@ -52,7 +52,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -76,6 +76,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -99,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -111,7 +112,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
     </language>
   </registry>
@@ -234,7 +234,7 @@
                         <node concept="X8dFx" id="2lop6rSg627" role="2OqNvi">
                           <node concept="2OqwBi" id="2lop6rSg628" role="25WWJ7">
                             <node concept="37vLTw" id="2lop6rSg629" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSg62i" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2lL" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="2lop6rSg62a" role="2OqNvi">
                               <ref role="3TtcxE" to="tpce:f_TKVDF" resolve="linkDeclaration" />
@@ -251,7 +251,7 @@
                         <node concept="X8dFx" id="2lop6rSg62e" role="2OqNvi">
                           <node concept="2OqwBi" id="2lop6rSg62f" role="25WWJ7">
                             <node concept="37vLTw" id="2lop6rSg62g" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSg62i" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2lL" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="2lop6rSg62h" role="2OqNvi">
                               <ref role="3TtcxE" to="tpce:f_TKVDG" resolve="propertyDeclaration" />
@@ -261,9 +261,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2lop6rSg62i" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2lL" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2lop6rSg62j" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2lM" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps
index befcfe03ea8..4ccd34ca8da 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps
@@ -13,9 +13,9 @@
     <import index="tpch" ref="r:00000000-0000-4000-0000-011c8959028d(jetbrains.mps.lang.structure.editor)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="qqrq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.components(MPS.IDEA/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="qqrq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.components(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="qjvf" ref="r:82cadfba-0fcc-402e-8eaa-37395d383fb6(com.mbeddr.mpsutil.compare.behavior)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
@@ -70,7 +70,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -89,7 +89,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -114,7 +114,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -175,7 +175,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -191,7 +191,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -224,7 +224,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/intentions.mps
index a843da7575f..cd24c357f89 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/intentions.mps
@@ -119,7 +119,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps
index d6a1b212f98..358c2d1e21d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/typesystem.mps
index dbdb24d1776..5a436bb3ddb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/typesystem.mps
@@ -77,7 +77,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/com.mbeddr.mpsutil.conceptdiagram.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/com.mbeddr.mpsutil.conceptdiagram.sandbox.mpl
index 30454e6404c..2faeeab4306 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/com.mbeddr.mpsutil.conceptdiagram.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/com.mbeddr.mpsutil.conceptdiagram.sandbox.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
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 21a8345b38a..6bf3746db7b 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
@@ -6,7 +6,7 @@
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <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="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
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 84821f37996..49281f0460c 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
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
@@ -27,7 +26,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -54,7 +53,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" 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 c99a1be81e8..a650d443359 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
@@ -5,7 +5,7 @@
     <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" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -321,6 +321,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -833,7 +834,7 @@
                               <node concept="2OqwBi" id="7nHDAjUC6p3" role="3clFbG">
                                 <node concept="2OqwBi" id="7nHDAjUC6p4" role="2Oq$k0">
                                   <node concept="37vLTw" id="7nHDAjUC6p5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7nHDAjUC6p8" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2lP" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="7nHDAjUC6p6" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpce:f_TJDff" resolve="extends" />
@@ -843,9 +844,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7nHDAjUC6p8" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2lP" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7nHDAjUC6p9" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2lQ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -856,11 +857,11 @@
                           <node concept="3clFbF" id="7nHDAjUC6pd" role="3cqZAp">
                             <node concept="1Ls8ON" id="7nHDAjUC6pe" role="3clFbG">
                               <node concept="37vLTw" id="7nHDAjUC6pf" role="1Lso8e">
-                                <ref role="3cqZAo" node="7nHDAjUC6pj" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2lR" resolve="it" />
                               </node>
                               <node concept="2OqwBi" id="7nHDAjUC6pg" role="1Lso8e">
                                 <node concept="37vLTw" id="7nHDAjUC6ph" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7nHDAjUC6pj" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2lR" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7nHDAjUC6pi" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tpce:f_TJDff" resolve="extends" />
@@ -869,9 +870,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7nHDAjUC6pj" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2lR" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7nHDAjUC6pk" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2lS" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -917,7 +918,7 @@
                                 <node concept="2OqwBi" id="3OnN3di7oQG" role="3clFbG">
                                   <node concept="2OqwBi" id="3OnN3di7oQH" role="2Oq$k0">
                                     <node concept="37vLTw" id="3OnN3di7oQI" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3OnN3di7oQL" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2lT" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="3OnN3di7EHU" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpce:h0PrDRO" resolve="extends" />
@@ -927,9 +928,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3OnN3di7oQL" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2lT" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3OnN3di7oQM" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2lU" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -941,7 +942,7 @@
                               <node concept="2OqwBi" id="7nHDAjUoB3b" role="3clFbG">
                                 <node concept="2OqwBi" id="7nHDAjUojOQ" role="2Oq$k0">
                                   <node concept="37vLTw" id="7nHDAjUohTY" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7nHDAjUo4Pc" resolve="base" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2lX" resolve="base" />
                                   </node>
                                   <node concept="3Tsc0h" id="7nHDAjUo$fm" role="2OqNvi">
                                     <ref role="3TtcxE" to="tpce:h0PrDRO" resolve="extends" />
@@ -953,11 +954,11 @@
                                       <node concept="3clFbF" id="7nHDAjUoJE7" role="3cqZAp">
                                         <node concept="1Ls8ON" id="7nHDAjUoJE6" role="3clFbG">
                                           <node concept="37vLTw" id="7nHDAjUoYbT" role="1Lso8e">
-                                            <ref role="3cqZAo" node="7nHDAjUo4Pc" resolve="base" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2lX" resolve="base" />
                                           </node>
                                           <node concept="2OqwBi" id="7nHDAjUp943" role="1Lso8e">
                                             <node concept="37vLTw" id="7nHDAjUp12e" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7nHDAjUoG9i" resolve="extendz" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2lV" resolve="extendz" />
                                             </node>
                                             <node concept="3TrEf2" id="7nHDAjUpcv6" role="2OqNvi">
                                               <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -966,18 +967,18 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7nHDAjUoG9i" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2lV" role="1bW2Oz">
                                       <property role="TrG5h" value="extendz" />
-                                      <node concept="2jxLKc" id="7nHDAjUoG9j" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2lW" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7nHDAjUo4Pc" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2lX" role="1bW2Oz">
                             <property role="TrG5h" value="base" />
-                            <node concept="2jxLKc" id="7nHDAjUo4Pd" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2lY" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1006,7 +1007,7 @@
                                     <property role="3cmrfH" value="1" />
                                   </node>
                                   <node concept="37vLTw" id="7nHDAjUFb3a" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="7nHDAjUDJ_h" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2lZ" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1021,7 +1022,7 @@
                                     <property role="3cmrfH" value="0" />
                                   </node>
                                   <node concept="37vLTw" id="7nHDAjUEMhf" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="7nHDAjUDJ_h" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2lZ" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1029,9 +1030,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7nHDAjUDJ_h" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2lZ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7nHDAjUDJ_i" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2m0" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1805,7 +1806,7 @@
                       </node>
                       <node concept="2OqwBi" id="6vp$_2v9N0a" role="3uHU7B">
                         <node concept="37vLTw" id="6vp$_2v9MVg" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6vp$_2v9MQH" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2m1" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6vp$_2v9NkP" role="2OqNvi">
                           <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
@@ -1814,9 +1815,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6vp$_2v9MQH" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2m1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6vp$_2v9MQI" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2m2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2975,7 +2976,7 @@
                               <node concept="37u81S" id="5oCf_1NSDlt" role="3uHU7w" />
                               <node concept="2OqwBi" id="5oCf_1NSDlu" role="3uHU7B">
                                 <node concept="37vLTw" id="5oCf_1NSDlv" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5oCf_1NSDlx" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2m3" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5oCf_1NSDlw" role="2OqNvi">
                                   <ref role="3Tt5mk" to="45ke:2igMYjpPzq8" resolve="concept" />
@@ -2984,9 +2985,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5oCf_1NSDlx" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2m3" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5oCf_1NSDly" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2m4" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3101,7 +3102,7 @@
                                   <node concept="2OqwBi" id="2igMYjpFICB" role="3uHU7B">
                                     <node concept="2OqwBi" id="2igMYjpFBnD" role="2Oq$k0">
                                       <node concept="37vLTw" id="2igMYjpF_vw" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2igMYjpD4zh" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2m5" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2igMYjpFEXP" role="2OqNvi">
                                         <ref role="3Tt5mk" to="tpce:f_TJDff" resolve="extends" />
@@ -3121,7 +3122,7 @@
                                     <node concept="3JPx81" id="2igMYjpDoSf" role="2OqNvi">
                                       <node concept="2OqwBi" id="2igMYjpEiFD" role="25WWJ7">
                                         <node concept="37vLTw" id="2igMYjpDzha" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2igMYjpD4zh" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2m5" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="2igMYjpEr37" role="2OqNvi">
                                           <ref role="3Tt5mk" to="tpce:f_TJDff" resolve="extends" />
@@ -3132,9 +3133,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2igMYjpD4zh" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2m5" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2igMYjpD4zi" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2m6" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3145,11 +3146,11 @@
                             <node concept="3clFbF" id="2igMYjpBzKE" role="3cqZAp">
                               <node concept="1Ls8ON" id="2igMYjpBzKF" role="3clFbG">
                                 <node concept="37vLTw" id="2igMYjpBzKG" role="1Lso8e">
-                                  <ref role="3cqZAo" node="2igMYjpE$mU" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2m7" resolve="it" />
                                 </node>
                                 <node concept="2OqwBi" id="2igMYjpBzKH" role="1Lso8e">
                                   <node concept="37vLTw" id="2igMYjpBzKI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2igMYjpE$mU" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2m7" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2igMYjpBzKJ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpce:f_TJDff" resolve="extends" />
@@ -3158,9 +3159,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2igMYjpE$mU" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2m7" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2igMYjpE$mV" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2m8" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3211,7 +3212,7 @@
                                         <node concept="2OqwBi" id="2igMYjpHEPF" role="576Qk">
                                           <node concept="2OqwBi" id="2igMYjpGGj2" role="2Oq$k0">
                                             <node concept="37vLTw" id="2igMYjpGEUE" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2igMYjpBzLk" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2m9" resolve="it" />
                                             </node>
                                             <node concept="3Tsc0h" id="2igMYjpGJ$s" role="2OqNvi">
                                               <ref role="3TtcxE" to="tpce:h0PrDRO" resolve="extends" />
@@ -3228,7 +3229,7 @@
                                   <node concept="2OqwBi" id="2igMYjpBzLf" role="3uHU7B">
                                     <node concept="2OqwBi" id="2igMYjpBzLg" role="2Oq$k0">
                                       <node concept="37vLTw" id="2igMYjpBzLh" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2igMYjpBzLk" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2m9" resolve="it" />
                                       </node>
                                       <node concept="3Tsc0h" id="2igMYjpBzLi" role="2OqNvi">
                                         <ref role="3TtcxE" to="tpce:h0PrDRO" resolve="extends" />
@@ -3239,9 +3240,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2igMYjpBzLk" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2m9" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2igMYjpBzLl" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2ma" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3254,7 +3255,7 @@
                                 <node concept="2OqwBi" id="2igMYjpGUVr" role="2Oq$k0">
                                   <node concept="2OqwBi" id="2igMYjpBzLr" role="2Oq$k0">
                                     <node concept="37vLTw" id="2igMYjpBzLs" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2igMYjpBzLD" resolve="base" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2mf" resolve="base" />
                                     </node>
                                     <node concept="3Tsc0h" id="2igMYjpBzLt" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpce:h0PrDRO" resolve="extends" />
@@ -3276,7 +3277,7 @@
                                             <node concept="3JPx81" id="2igMYjpHk$M" role="2OqNvi">
                                               <node concept="2OqwBi" id="2igMYjpHyLW" role="25WWJ7">
                                                 <node concept="37vLTw" id="2igMYjpHvEm" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2igMYjpGZBB" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2mb" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2igMYjpH_Xc" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -3286,9 +3287,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2igMYjpGZBB" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2mb" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="2igMYjpGZBC" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2mc" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -3299,11 +3300,11 @@
                                       <node concept="3clFbF" id="2igMYjpBzLx" role="3cqZAp">
                                         <node concept="1Ls8ON" id="2igMYjpBzLy" role="3clFbG">
                                           <node concept="37vLTw" id="2igMYjpBzLz" role="1Lso8e">
-                                            <ref role="3cqZAo" node="2igMYjpBzLD" resolve="base" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2mf" resolve="base" />
                                           </node>
                                           <node concept="2OqwBi" id="2igMYjpBzL$" role="1Lso8e">
                                             <node concept="37vLTw" id="2igMYjpBzL_" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2igMYjpBzLB" resolve="extendz" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2md" resolve="extendz" />
                                             </node>
                                             <node concept="3TrEf2" id="2igMYjpBzLA" role="2OqNvi">
                                               <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -3312,18 +3313,18 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="2igMYjpBzLB" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2md" role="1bW2Oz">
                                       <property role="TrG5h" value="extendz" />
-                                      <node concept="2jxLKc" id="2igMYjpBzLC" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2me" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2igMYjpBzLD" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2mf" role="1bW2Oz">
                             <property role="TrG5h" value="base" />
-                            <node concept="2jxLKc" id="2igMYjpBzLE" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2mg" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3497,7 +3498,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="5oCf_1NSKky" role="3uHU7B">
                                       <node concept="37vLTw" id="5oCf_1NSKkz" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5oCf_1NSKk_" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2mh" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="5oCf_1NSKk$" role="2OqNvi">
                                         <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -3506,9 +3507,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5oCf_1NSKk_" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2mh" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="5oCf_1NSKkA" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2mi" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3565,7 +3566,7 @@
                         </node>
                         <node concept="2OqwBi" id="4AXwGoMI9uD" role="3uHU7B">
                           <node concept="37vLTw" id="4AXwGoMI9ib" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4AXwGoMI95c" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2mj" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4AXwGoMIa1U" role="2OqNvi">
                             <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -3574,9 +3575,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4AXwGoMI95c" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2mj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4AXwGoMI95d" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2mk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3648,7 +3649,7 @@
                             <node concept="3JPx81" id="5oCf_1NVaex" role="2OqNvi">
                               <node concept="2OqwBi" id="5oCf_1NVapo" role="25WWJ7">
                                 <node concept="37vLTw" id="5oCf_1NVaiN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5oCf_1NUR_9" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2ml" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5oCf_1NVaIG" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
@@ -3658,9 +3659,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5oCf_1NUR_9" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ml" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5oCf_1NUR_a" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2mm" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3837,7 +3838,7 @@
                             <node concept="3JPx81" id="4AXwGoMCXDd" role="2OqNvi">
                               <node concept="2OqwBi" id="4AXwGoMCYcJ" role="25WWJ7">
                                 <node concept="37vLTw" id="4AXwGoMCXIo" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4AXwGoMCQUC" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2mn" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="4AXwGoMCYu6" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -3847,9 +3848,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4AXwGoMCQUC" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2mn" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4AXwGoMCQUD" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2mo" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5701,16 +5702,16 @@
                             </node>
                             <node concept="3JPx81" id="2_iQ3fLeo6s" role="2OqNvi">
                               <node concept="37vLTw" id="2_iQ3fLeo6t" role="25WWJ7">
-                                <ref role="3cqZAo" node="2_iQ3fLeo6u" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2mp" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2_iQ3fLeo6u" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2mp" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2_iQ3fLeo6v" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2mq" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5793,7 +5794,7 @@
                           <node concept="1pGfFk" id="6vp$_2vHajc" role="2ShVmc">
                             <ref role="37wK5l" node="6vp$_2vA0Fq" resolve="ExistingSubstituteAction" />
                             <node concept="37vLTw" id="6vp$_2vHajd" role="37wK5m">
-                              <ref role="3cqZAo" node="2_iQ3fLeqDE" resolve="conceptDeclaration" />
+                              <ref role="3cqZAo" node="2SR9xrsN2mr" resolve="conceptDeclaration" />
                             </node>
                             <node concept="37vLTw" id="6vp$_2vHw3O" role="37wK5m">
                               <ref role="3cqZAo" node="6vp$_2vHHVs" resolve="diagram" />
@@ -5810,7 +5811,7 @@
                               </node>
                               <node concept="3JPx81" id="6vp$_2vHajl" role="2OqNvi">
                                 <node concept="37vLTw" id="6vp$_2vHajm" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2_iQ3fLeqDE" resolve="conceptDeclaration" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2mr" resolve="conceptDeclaration" />
                                 </node>
                               </node>
                             </node>
@@ -5820,9 +5821,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2_iQ3fLeqDE" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2mr" role="1bW2Oz">
                   <property role="TrG5h" value="conceptDeclaration" />
-                  <node concept="2jxLKc" id="2_iQ3fLeqDF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ms" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps
index d6c90d056e8..df77d4da364 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -67,7 +67,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -121,20 +121,21 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -142,7 +143,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -192,7 +193,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -204,7 +205,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -342,7 +342,7 @@
                         <node concept="17R0WA" id="3bBtawT5Ctv" role="3uHU7B">
                           <node concept="2OqwBi" id="3bBtawT5Ctw" role="3uHU7B">
                             <node concept="37vLTw" id="3bBtawT7YAV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3bBtawT7YgP" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2mt" resolve="it" />
                             </node>
                             <node concept="I4A8Y" id="3bBtawT5Cty" role="2OqNvi" />
                           </node>
@@ -370,7 +370,7 @@
                             </node>
                             <node concept="3JPx81" id="3bBtawT7Z3u" role="2OqNvi">
                               <node concept="37vLTw" id="3bBtawT7Z3v" role="25WWJ7">
-                                <ref role="3cqZAo" node="3bBtawT7YgP" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2mt" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -378,9 +378,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3bBtawT7YgP" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2mt" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3bBtawT7YgQ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2mu" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -406,7 +406,7 @@
                               <ref role="2pIpSl" to="45ke:2igMYjpPzq8" resolve="concept" />
                               <node concept="36biLy" id="3bBtawT88xh" role="28nt2d">
                                 <node concept="37vLTw" id="3bBtawT88OB" role="36biLW">
-                                  <ref role="3cqZAo" node="3bBtawT82Wd" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2mv" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -416,9 +416,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3bBtawT82Wd" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2mv" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3bBtawT82We" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2mw" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/structure.mps
index df227caccea..76fce673ac6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/structure.mps
@@ -50,6 +50,23 @@
     <property role="EcuMT" value="2634829965774842138" />
     <property role="34LRSv" value="concept diagram" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="2igMYjp_Ggs" role="1TKVEi">
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="contents" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="IQ2ns" value="2634829965775258652" />
+      <ref role="20lvS9" node="2igMYjpPzq7" resolve="AbstractConceptDeclarationRef" />
+    </node>
+    <node concept="1TJgyj" id="7APyAbMnxWJ" role="1TKVEi">
+      <property role="IQ2ns" value="8770068006951591727" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="languagesInScope" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" to="tp25:3TEgbCBRn3N" resolve="LanguageRefExpression" />
+    </node>
+    <node concept="PrWs8" id="2igMYjp$jPf" role="PzmwI">
+      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    </node>
     <node concept="1TJgyi" id="1FnP670bD7A" role="1TKVEl">
       <property role="IQ2nx" value="1934248081280111078" />
       <property role="TrG5h" value="dontSaveLayoutData" />
@@ -70,23 +87,6 @@
       <property role="TrG5h" value="ignoredDeprecatedConcepts" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
-    <node concept="1TJgyj" id="2igMYjp_Ggs" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <property role="IQ2ns" value="2634829965775258652" />
-      <ref role="20lvS9" node="2igMYjpPzq7" resolve="AbstractConceptDeclarationRef" />
-    </node>
-    <node concept="1TJgyj" id="7APyAbMnxWJ" role="1TKVEi">
-      <property role="IQ2ns" value="8770068006951591727" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="languagesInScope" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" to="tp25:3TEgbCBRn3N" resolve="LanguageRefExpression" />
-    </node>
-    <node concept="PrWs8" id="2igMYjp$jPf" role="PzmwI">
-      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    </node>
   </node>
   <node concept="1TIwiD" id="2igMYjpPzq7">
     <property role="TrG5h" value="AbstractConceptDeclarationRef" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/com.mbeddr.mpsutil.contextactions.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/com.mbeddr.mpsutil.contextactions.mpl
index 5a2d1acc164..942cc747595 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/com.mbeddr.mpsutil.contextactions.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/com.mbeddr.mpsutil.contextactions.mpl
@@ -44,7 +44,7 @@
         <language slang="l:677f00fb-4488-405e-9885-abb75d472fd1:com.mbeddr.mpsutil.contextactions" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -196,7 +196,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -217,7 +216,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/generator/template/main@generator.mps
index c15d4f094e6..2027052ed1a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/generator/template/main@generator.mps
@@ -51,7 +51,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -152,7 +152,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -178,7 +178,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -216,7 +216,7 @@
         <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="7473026166162297915" name="jetbrains.mps.lang.generator.structure.DropAttributeRule" flags="lg" index="CY16f">
@@ -266,6 +266,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -390,7 +391,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -474,7 +475,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
@@ -3715,7 +3715,7 @@
                         <node concept="2OqwBi" id="7husA5YkC2C" role="3clFbG">
                           <node concept="2OqwBi" id="7husA5YkA1X" role="2Oq$k0">
                             <node concept="37vLTw" id="7husA5Yk_U0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7husA5Yk_JW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2mC" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="7husA5YkBG0" role="2OqNvi">
                               <node concept="3CFYIy" id="7husA5YkBQ7" role="3CFYIz">
@@ -3727,9 +3727,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7husA5Yk_JW" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2mC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7husA5Yk_JX" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2mD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3753,7 +3753,7 @@
                         <node concept="2OqwBi" id="2hz1PZpFcvI" role="3clFbG">
                           <node concept="2OqwBi" id="2hz1PZpFcvJ" role="2Oq$k0">
                             <node concept="37vLTw" id="2hz1PZpFcvK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hz1PZpFcvO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2mE" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="2hz1PZpFcvL" role="2OqNvi">
                               <node concept="3CFYIy" id="2hz1PZpFcvM" role="3CFYIz">
@@ -3765,9 +3765,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2hz1PZpFcvO" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2mE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2hz1PZpFcvP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2mF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3844,7 +3844,7 @@
                         <node concept="2OqwBi" id="7husA5YiwMa" role="3clFbG">
                           <node concept="2OqwBi" id="7husA5YiuHA" role="2Oq$k0">
                             <node concept="37vLTw" id="7husA5Yiu$u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7husA5YiujA" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2mG" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="7husA5YiwoV" role="2OqNvi">
                               <node concept="3CFYIy" id="7husA5Yiw$k" role="3CFYIz">
@@ -3856,9 +3856,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7husA5YiujA" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2mG" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7husA5YiujB" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2mH" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4111,7 +4111,7 @@
                         <node concept="2OqwBi" id="2hz1PZpFoh0" role="3clFbG">
                           <node concept="2OqwBi" id="2hz1PZpFoh1" role="2Oq$k0">
                             <node concept="37vLTw" id="2hz1PZpFoh2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hz1PZpFoh6" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2mI" resolve="it" />
                             </node>
                             <node concept="3CFZ6_" id="2hz1PZpFoh3" role="2OqNvi">
                               <node concept="3CFYIy" id="2hz1PZpFoh4" role="3CFYIz">
@@ -4123,9 +4123,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2hz1PZpFoh6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2mI" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2hz1PZpFoh7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2mJ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5117,7 +5117,7 @@
                                       <node concept="2OqwBi" id="23_jb1zpjj" role="1eOMHV">
                                         <node concept="2JrnkZ" id="23_jb1zpjk" role="2Oq$k0">
                                           <node concept="37vLTw" id="23_jb1zpjl" role="2JrQYb">
-                                            <ref role="3cqZAo" node="23_jb1zpjH" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2mK" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="23_jb1zpjm" role="2OqNvi">
@@ -5171,7 +5171,7 @@
                                   <node concept="2OqwBi" id="23_jb1zpjD" role="3uHU7B">
                                     <node concept="2JrnkZ" id="23_jb1zpjE" role="2Oq$k0">
                                       <node concept="37vLTw" id="23_jb1zpjF" role="2JrQYb">
-                                        <ref role="3cqZAo" node="23_jb1zpjH" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2mK" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="23_jb1zpjG" role="2OqNvi">
@@ -5182,9 +5182,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="23_jb1zpjH" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2mK" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="23_jb1zpjI" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2mL" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/behavior.mps
index 2ac045424e3..7b2b801ba23 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/behavior.mps
@@ -96,7 +96,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -106,7 +106,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -168,7 +168,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/constraints.mps
index 03240464182..f801320bc46 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/constraints.mps
@@ -24,7 +24,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -84,7 +84,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,7 +97,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -123,6 +123,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -173,7 +174,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -181,7 +182,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -371,7 +371,7 @@
                                     <node concept="1rGIog" id="2lop6rSg6fh" role="2OqNvi" />
                                     <node concept="2OqwBi" id="2lop6rSg6fi" role="2Oq$k0">
                                       <node concept="37vLTw" id="2lop6rSg6fj" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2lop6rSg6fD" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2mx" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2lop6rSg6fk" role="2OqNvi">
                                         <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
@@ -396,7 +396,7 @@
                                   <node concept="2OqwBi" id="2lop6rSg6ft" role="2Oq$k0">
                                     <node concept="2OqwBi" id="2lop6rSg6fu" role="2Oq$k0">
                                       <node concept="37vLTw" id="2lop6rSg6fv" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2lop6rSg6fD" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2mx" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2lop6rSg6fw" role="2OqNvi">
                                         <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
@@ -422,9 +422,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2lop6rSg6fD" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2mx" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2lop6rSg6fE" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2my" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/editor.mps
index bcb50c04bde..92d9ae3f0a2 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/editor.mps
@@ -21,7 +21,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -65,7 +65,7 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -77,7 +77,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -111,7 +111,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -187,7 +187,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -201,6 +201,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -235,7 +236,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -251,7 +252,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -1473,13 +1473,13 @@
                             <node concept="3clFbS" id="7me2y0SPk2n" role="1bW5cS">
                               <node concept="3clFbF" id="7me2y0SPl30" role="3cqZAp">
                                 <node concept="37vLTw" id="7me2y0SPl2Z" role="3clFbG">
-                                  <ref role="3cqZAo" node="7me2y0SPk2o" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2mz" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7me2y0SPk2o" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2mz" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7me2y0SPk2p" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2m$" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1493,7 +1493,7 @@
                                 <node concept="17QB3L" id="4txsJZupWOx" role="1tU5fm" />
                                 <node concept="2OqwBi" id="4txsJZupWf8" role="33vP2m">
                                   <node concept="37vLTw" id="4txsJZupWf9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4txsJZupJQm" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2m_" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="4txsJZupWfa" role="2OqNvi">
                                     <ref role="37wK5l" to="nddn:~IntentionDescriptor.getPersistentStateKey()" resolve="getPersistentStateKey" />
@@ -1507,9 +1507,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4txsJZupJQm" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2m_" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4txsJZupJQn" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2mA" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/intentions.mps
index fb006104ce2..5c980233426 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/intentions.mps
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/structure.mps
index 902935dd486..593d3170840 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/structure.mps
@@ -60,7 +60,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/typesystem.mps
index c42aaa89d40..75e4ad383d0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/models/typesystem.mps
@@ -38,7 +38,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
       <concept id="1196350785117" name="jetbrains.mps.lang.quotation.structure.ReferenceAntiquotation" flags="ng" index="2c44tb" />
@@ -138,7 +138,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.mpl
index 33648280c7a..ff1c4486b9e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.mpl
@@ -41,7 +41,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -83,7 +83,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -96,7 +95,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/generator/template/main@generator.mps
index 6aae44199e9..5d691f4dd2c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/generator/template/main@generator.mps
@@ -107,7 +107,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,7 +124,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -153,7 +153,7 @@
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -267,7 +267,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/constraints.mps
index 16d47624613..31caaac95e7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/constraints.mps
@@ -43,7 +43,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -59,6 +59,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -83,7 +84,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -92,7 +93,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="1M2fIO" id="2cV6Bp1XCgG">
@@ -122,7 +122,7 @@
                   <node concept="3clFbF" id="5RIakkDITNE" role="3cqZAp">
                     <node concept="2OqwBi" id="5RIakkDITNF" role="3clFbG">
                       <node concept="37vLTw" id="5RIakkDITNG" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5RIakkDITNJ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2mP" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5RIakkDITNH" role="2OqNvi">
                         <node concept="chp4Y" id="5RIakkDITNI" role="cj9EA">
@@ -132,9 +132,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5RIakkDITNJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2mP" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5RIakkDITNK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2mQ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -170,7 +170,7 @@
                   <node concept="3clFbF" id="5RIakkDITNZ" role="3cqZAp">
                     <node concept="2OqwBi" id="5RIakkDITO0" role="3clFbG">
                       <node concept="37vLTw" id="5RIakkDITO1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5RIakkDITO4" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2mR" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5RIakkDITO2" role="2OqNvi">
                         <node concept="chp4Y" id="5RIakkDITO3" role="cj9EA">
@@ -180,9 +180,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5RIakkDITO4" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2mR" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5RIakkDITO5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2mS" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/editor.mps
index 1d70c77d2a6..46f3a76fef8 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/editor.mps
@@ -29,7 +29,7 @@
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -43,7 +43,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -57,7 +57,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/structure.mps
index 7f6b7999163..d0376b88e8a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/structure.mps
@@ -52,7 +52,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/typesystem.mps
index 6229fc67c37..e5f3b0d39d2 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/models/typesystem.mps
@@ -49,7 +49,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl
index 92dce4cbde6..93e703bd939 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl
@@ -28,7 +28,7 @@
         <language slang="l:27e888f7-20c7-4b89-9a66-3c9207e0608b:com.mbeddr.mpsutil.datepicker.sandbox" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -53,7 +53,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">98a7bbe2-0ea1-4503-9fc1-9efb7b48c6ea(com.mbeddr.mpsutil.datepicker.runtime)</dependency>
   </dependencies>
@@ -62,7 +61,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/generator/template/main@generator.mps
index bff56f456fb..5ae2c9479cb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/generator/template/main@generator.mps
@@ -21,7 +21,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps
index ffa55c08ac3..e33af6fa836 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps
@@ -36,7 +36,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
@@ -94,7 +94,7 @@
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -111,7 +111,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -140,7 +140,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/structure.mps
index 85dac5be5b4..193a0a3d6ec 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/structure.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl
index b214833fb9a..95fb949beb1 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl
@@ -33,7 +33,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -92,7 +92,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
     <dependency reexport="true">98a7bbe2-0ea1-4503-9fc1-9efb7b48c6ea(com.mbeddr.mpsutil.datepicker.runtime)</dependency>
@@ -102,7 +101,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps
index 6aa15cff72c..0a071209633 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps
@@ -111,7 +111,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,7 +131,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -153,7 +153,7 @@
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj">
         <reference id="1200916687663" name="labelDeclaration" index="2sdACS" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -214,7 +214,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps
index f7cef07ac3d..813284d1b2a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps
@@ -49,7 +49,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -74,7 +74,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/editor.mps
index b219d1d25be..587eeb0e44a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/editor.mps
@@ -29,7 +29,7 @@
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139744628335" name="jetbrains.mps.lang.editor.structure.CellModel_Image" flags="sg" stub="8104358048506731195" index="1u4HXA">
@@ -45,7 +45,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/structure.mps
index 97caa405b8f..090f0a1503c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/structure.mps
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 16bf1291ed5..1ccc26a7771 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
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -35,7 +34,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
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 9e55cfaca47..dd4ddc7cdf2 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
@@ -4,7 +4,7 @@
   <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="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
@@ -289,6 +289,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -431,7 +432,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -620,7 +620,7 @@
                                           <node concept="3clFbF" id="6bKTjCNktaH" role="3cqZAp">
                                             <node concept="2OqwBi" id="6bKTjCNktbw" role="3clFbG">
                                               <node concept="37vLTw" id="6bKTjCNktaG" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6bKTjCNkmPj" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2mW" resolve="it" />
                                               </node>
                                               <node concept="liA8E" id="6bKTjCNktqT" role="2OqNvi">
                                                 <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -678,7 +678,7 @@
                                             <node concept="37vLTI" id="6bKTjCNkxzt" role="3clFbG">
                                               <node concept="2OqwBi" id="6bKTjCNkxJn" role="37vLTx">
                                                 <node concept="37vLTw" id="6bKTjCNkxBi" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6bKTjCNkmPj" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2mW" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="6bKTjCNkybU" role="2OqNvi">
                                                   <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -706,10 +706,10 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6bKTjCNkmPj" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2mW" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
                               <property role="3TUv4t" value="true" />
-                              <node concept="2jxLKc" id="6bKTjCNkmPk" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2mX" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -813,7 +813,7 @@
                                           <node concept="3clFbF" id="6bKTjCNkVlx" role="3cqZAp">
                                             <node concept="2OqwBi" id="6bKTjCNkVmq" role="3clFbG">
                                               <node concept="37vLTw" id="6bKTjCNkVlw" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6bKTjCNkROq" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2mY" resolve="it" />
                                               </node>
                                               <node concept="liA8E" id="6bKTjCNkVS6" role="2OqNvi">
                                                 <ref role="37wK5l" to="mhbf:~SModel.getModelName()" resolve="getModelName" />
@@ -871,7 +871,7 @@
                                             <node concept="37vLTI" id="6bKTjCNl1A$" role="3clFbG">
                                               <node concept="2OqwBi" id="6bKTjCNl1KQ" role="37vLTx">
                                                 <node concept="37vLTw" id="6bKTjCNl1DR" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6bKTjCNkROq" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2mY" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="6bKTjCNl2Sr" role="2OqNvi">
                                                   <ref role="37wK5l" to="mhbf:~SModel.getModelName()" resolve="getModelName" />
@@ -899,10 +899,10 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6bKTjCNkROq" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2mY" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
                               <property role="3TUv4t" value="true" />
-                              <node concept="2jxLKc" id="6bKTjCNkROr" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2mZ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -922,7 +922,7 @@
                           <node concept="3clFbF" id="6bKTjCNqMGt" role="3cqZAp">
                             <node concept="2OqwBi" id="6bKTjCNqN3c" role="3clFbG">
                               <node concept="37vLTw" id="6bKTjCNqMGs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6bKTjCNqLEn" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2n0" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6bKTjCNqOfc" role="2OqNvi">
                                 <ref role="37wK5l" to="nkm5:KILMQGrGW$" resolve="getText" />
@@ -930,9 +930,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6bKTjCNqLEn" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2n0" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6bKTjCNqLEo" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2n1" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="1nlBCl" id="6bKTjCNqLEp" role="2S7zOq">
@@ -1261,7 +1261,7 @@
                                 <node concept="10QFUN" id="3mf03aPfNDv" role="1eOMHV">
                                   <node concept="2OqwBi" id="3mf03aPfNDr" role="10QFUP">
                                     <node concept="37vLTw" id="3mf03aPfNDs" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3mf03aPfFRT" resolve="module" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2n6" resolve="module" />
                                     </node>
                                     <node concept="liA8E" id="3mf03aPfNDt" role="2OqNvi">
                                       <ref role="37wK5l" to="lui2:~SModule.getDeclaredDependencies()" resolve="getDeclaredDependencies" />
@@ -1285,7 +1285,7 @@
                                         <node concept="3JPx81" id="3mf03aPfV3W" role="2OqNvi">
                                           <node concept="2OqwBi" id="3mf03aPfQB4" role="25WWJ7">
                                             <node concept="37vLTw" id="3mf03aPfQkv" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3mf03aPfPIC" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2n2" resolve="it" />
                                             </node>
                                             <node concept="liA8E" id="3mf03aPfRvP" role="2OqNvi">
                                               <ref role="37wK5l" to="lui2:~SDependency.getTarget()" resolve="getTarget" />
@@ -1295,9 +1295,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3mf03aPfPIC" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2n2" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3mf03aPfPID" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2n3" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1308,26 +1308,26 @@
                                   <node concept="3clFbF" id="3mf03aPfYUh" role="3cqZAp">
                                     <node concept="1Ls8ON" id="3mf03aPfYUg" role="3clFbG">
                                       <node concept="37vLTw" id="3mf03aPg0Wo" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPfFRT" resolve="module" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2n6" resolve="module" />
                                       </node>
                                       <node concept="37vLTw" id="3mf03aPg2lq" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPfYgv" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2n4" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3mf03aPfYgv" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2n4" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3mf03aPfYgw" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2n5" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPfFRT" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2n6" role="1bW2Oz">
                         <property role="TrG5h" value="module" />
-                        <node concept="2jxLKc" id="3mf03aPfFRU" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2n7" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1560,7 +1560,7 @@
                                 <node concept="10QFUN" id="3mf03aPg4QS" role="1eOMHV">
                                   <node concept="2OqwBi" id="3mf03aPg4QT" role="10QFUP">
                                     <node concept="37vLTw" id="3mf03aPg4QU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3mf03aPg4Rj" resolve="module" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2nc" resolve="module" />
                                     </node>
                                     <node concept="liA8E" id="3mf03aPg4QV" role="2OqNvi">
                                       <ref role="37wK5l" to="lui2:~SModule.getUsedLanguages()" resolve="getUsedLanguages" />
@@ -1584,7 +1584,7 @@
                                         <node concept="3JPx81" id="3mf03aPg4R4" role="2OqNvi">
                                           <node concept="2OqwBi" id="3mf03aPg4R5" role="25WWJ7">
                                             <node concept="37vLTw" id="3mf03aPg4R6" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3mf03aPg4R8" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2n8" resolve="it" />
                                             </node>
                                             <node concept="liA8E" id="3mf03aPg4R7" role="2OqNvi">
                                               <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
@@ -1594,9 +1594,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3mf03aPg4R8" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2n8" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3mf03aPg4R9" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2n9" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1607,26 +1607,26 @@
                                   <node concept="3clFbF" id="3mf03aPg4Rd" role="3cqZAp">
                                     <node concept="1Ls8ON" id="3mf03aPg4Re" role="3clFbG">
                                       <node concept="37vLTw" id="3mf03aPg4Rf" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPg4Rj" resolve="module" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2nc" resolve="module" />
                                       </node>
                                       <node concept="37vLTw" id="3mf03aPg4Rg" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPg4Rh" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2na" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3mf03aPg4Rh" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2na" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3mf03aPg4Ri" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2nb" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPg4Rj" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2nc" role="1bW2Oz">
                         <property role="TrG5h" value="module" />
-                        <node concept="2jxLKc" id="3mf03aPg4Rk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2nd" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1783,7 +1783,7 @@
                           <node concept="3clFbF" id="3mf03aPgBL7" role="3cqZAp">
                             <node concept="2OqwBi" id="3mf03aPgBL8" role="3clFbG">
                               <node concept="37vLTw" id="3mf03aPgBL9" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3mf03aPgBLb" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2ne" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3mf03aPgBLa" role="2OqNvi">
                                 <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -1791,9 +1791,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3mf03aPgBLb" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2ne" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3mf03aPgBLc" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2nf" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1818,7 +1818,7 @@
                                     <node concept="1eOMI4" id="3mf03aPghi6" role="2Oq$k0">
                                       <node concept="10QFUN" id="3mf03aPghi7" role="1eOMHV">
                                         <node concept="37vLTw" id="3mf03aPghi8" role="10QFUP">
-                                          <ref role="3cqZAo" node="3mf03aPggJ0" resolve="model" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2nk" resolve="model" />
                                         </node>
                                         <node concept="3uibUv" id="4rHwORqCxpM" role="10QFUM">
                                           <ref role="3uigEE" to="w1kc:~SModelInternal" resolve="SModelInternal" />
@@ -1847,7 +1847,7 @@
                                         <node concept="3JPx81" id="3mf03aPgMH2" role="2OqNvi">
                                           <node concept="2OqwBi" id="3mf03aPgOaU" role="25WWJ7">
                                             <node concept="37vLTw" id="3mf03aPgNrk" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3mf03aPgnng" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2ng" resolve="it" />
                                             </node>
                                             <node concept="liA8E" id="3mf03aPgPda" role="2OqNvi">
                                               <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
@@ -1857,9 +1857,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3mf03aPgnng" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2ng" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3mf03aPgnnh" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2nh" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1870,26 +1870,26 @@
                                   <node concept="3clFbF" id="3mf03aPgS5E" role="3cqZAp">
                                     <node concept="1Ls8ON" id="3mf03aPgS5D" role="3clFbG">
                                       <node concept="37vLTw" id="3mf03aPgXc1" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPggJ0" resolve="model" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2nk" resolve="model" />
                                       </node>
                                       <node concept="37vLTw" id="3mf03aPgWkv" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPgRjg" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2ni" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3mf03aPgRjg" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2ni" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3mf03aPgRjh" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2nj" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPggJ0" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2nk" role="1bW2Oz">
                         <property role="TrG5h" value="model" />
-                        <node concept="2jxLKc" id="3mf03aPggJ1" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2nl" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2039,7 +2039,7 @@
                                 <ref role="37wK5l" node="3mf03aPdkGc" resolve="filterModelsOutsideSameModule" />
                                 <node concept="2OqwBi" id="3mf03aPhDWD" role="37wK5m">
                                   <node concept="37vLTw" id="3mf03aPhCV3" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3mf03aPhizt" resolve="model" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ns" resolve="model" />
                                   </node>
                                   <node concept="liA8E" id="3mf03aPhFq0" role="2OqNvi">
                                     <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
@@ -2068,7 +2068,7 @@
                                     <node concept="3clFbF" id="3mf03aPhPc6" role="3cqZAp">
                                       <node concept="2OqwBi" id="3mf03aPhPc7" role="3clFbG">
                                         <node concept="37vLTw" id="3mf03aPhPc8" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3mf03aPhPca" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2nm" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="3mf03aPhPc9" role="2OqNvi">
                                           <ref role="37wK5l" to="mhbf:~SModel.getModelName()" resolve="getModelName" />
@@ -2076,9 +2076,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3mf03aPhPca" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2nm" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3mf03aPhPcb" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2nn" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -2099,7 +2099,7 @@
                                 <node concept="1pGfFk" id="4rHwORqCs9m" role="2ShVmc">
                                   <ref role="37wK5l" to="w1kc:~ModelImports.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel)" resolve="ModelImports" />
                                   <node concept="37vLTw" id="4rHwORqCsBF" role="37wK5m">
-                                    <ref role="3cqZAo" node="3mf03aPhizt" resolve="model" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ns" resolve="model" />
                                   </node>
                                 </node>
                               </node>
@@ -2134,7 +2134,7 @@
                                           <node concept="3JPx81" id="3mf03aPpSqc" role="2OqNvi">
                                             <node concept="2OqwBi" id="3mf03aPpSqd" role="25WWJ7">
                                               <node concept="37vLTw" id="3mf03aPpSqf" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3mf03aPiiFQ" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2no" resolve="it" />
                                               </node>
                                               <node concept="liA8E" id="3mf03aPpSqh" role="2OqNvi">
                                                 <ref role="37wK5l" to="mhbf:~SModelReference.getModelName()" resolve="getModelName" />
@@ -2145,9 +2145,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3mf03aPiiFQ" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2no" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3mf03aPiiFR" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2np" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -2166,26 +2166,26 @@
                                   <node concept="3clFbF" id="3mf03aPiiFZ" role="3cqZAp">
                                     <node concept="1Ls8ON" id="3mf03aPiiG0" role="3clFbG">
                                       <node concept="37vLTw" id="3mf03aPiiG1" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPhizt" resolve="model" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2ns" resolve="model" />
                                       </node>
                                       <node concept="37vLTw" id="3mf03aPiiG2" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPiiG3" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2nq" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3mf03aPiiG3" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2nq" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3mf03aPiiG4" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2nr" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPhizt" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ns" role="1bW2Oz">
                         <property role="TrG5h" value="model" />
-                        <node concept="2jxLKc" id="3mf03aPhizu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2nt" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3101,7 +3101,7 @@
                       <node concept="3clFbF" id="77UHMYYStXt" role="3cqZAp">
                         <node concept="2OqwBi" id="77UHMYYStXu" role="3clFbG">
                           <node concept="37vLTw" id="77UHMYYStXv" role="2Oq$k0">
-                            <ref role="3cqZAo" node="77UHMYYStXx" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2nu" resolve="it" />
                           </node>
                           <node concept="liA8E" id="77UHMYYStXw" role="2OqNvi">
                             <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
@@ -3109,9 +3109,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="77UHMYYStXx" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2nu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="77UHMYYStXy" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2nv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3281,7 +3281,7 @@
                       </node>
                       <node concept="2OqwBi" id="3mf03aPdCWO" role="3uHU7B">
                         <node concept="37vLTw" id="3mf03aPdCTt" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3mf03aPdCNU" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2nw" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3mf03aPdDnF" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
@@ -3290,9 +3290,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3mf03aPdCNU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2nw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3mf03aPdCNV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2nx" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3372,15 +3372,15 @@
                       </node>
                       <node concept="3JPx81" id="3mf03aPcJX$" role="2OqNvi">
                         <node concept="37vLTw" id="3mf03aPcK6G" role="25WWJ7">
-                          <ref role="3cqZAo" node="3mf03aPcIR6" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2ny" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3mf03aPcIR6" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ny" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3mf03aPcIR7" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2nz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3452,7 +3452,7 @@
                       <node concept="1rXfSq" id="4AXwGoMz7Tx" role="3clFbG">
                         <ref role="37wK5l" node="77UHMYYT10E" resolve="resolveModel" />
                         <node concept="37vLTw" id="4AXwGoMz7Ty" role="37wK5m">
-                          <ref role="3cqZAo" node="3mf03aPctBu" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2n$" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="4AXwGoMz7Tz" role="37wK5m">
                           <ref role="3cqZAo" node="3mf03aPcEGO" resolve="context" />
@@ -3460,9 +3460,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3mf03aPctBu" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2n$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3mf03aPctBv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2n_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3474,14 +3474,14 @@
                     <node concept="3y3z36" id="4AXwGoMqYIi" role="3clFbG">
                       <node concept="10Nm6u" id="4AXwGoMqYRm" role="3uHU7w" />
                       <node concept="37vLTw" id="4AXwGoMqYAM" role="3uHU7B">
-                        <ref role="3cqZAo" node="4AXwGoMqYrs" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2nA" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4AXwGoMqYrs" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2nA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4AXwGoMqYrt" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2nB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3559,15 +3559,15 @@
                       </node>
                       <node concept="3JPx81" id="3mf03aPcOK8" role="2OqNvi">
                         <node concept="37vLTw" id="3mf03aPdcyN" role="25WWJ7">
-                          <ref role="3cqZAo" node="3mf03aPcOKa" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2nC" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3mf03aPcOKa" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2nC" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3mf03aPcOKb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2nD" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3640,7 +3640,7 @@
                       <node concept="1rXfSq" id="3mf03aPcOJC" role="3clFbG">
                         <ref role="37wK5l" node="77UHMYYSFER" resolve="resolveModule" />
                         <node concept="37vLTw" id="3mf03aPcOJD" role="37wK5m">
-                          <ref role="3cqZAo" node="3mf03aPcOJF" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2nE" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="3mf03aPcOJE" role="37wK5m">
                           <ref role="3cqZAo" node="3mf03aPcOJM" resolve="context" />
@@ -3648,9 +3648,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3mf03aPcOJF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2nE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3mf03aPcOJG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2nF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3662,14 +3662,14 @@
                     <node concept="3y3z36" id="4AXwGoMr0$c" role="3clFbG">
                       <node concept="10Nm6u" id="4AXwGoMr0E2" role="3uHU7w" />
                       <node concept="37vLTw" id="4AXwGoMr0w0" role="3uHU7B">
-                        <ref role="3cqZAo" node="4AXwGoMr0o3" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2nG" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4AXwGoMr0o3" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2nG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4AXwGoMr0o4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2nH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4597,7 +4597,7 @@
                           <node concept="3clFbF" id="3mf03aPeYLe" role="3cqZAp">
                             <node concept="2OqwBi" id="3mf03aPeYLf" role="3clFbG">
                               <node concept="37vLTw" id="3mf03aPeYLg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3mf03aPeYLi" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2nI" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3mf03aPeYLh" role="2OqNvi">
                                 <ref role="37wK5l" to="mhbf:~SModel.getModelName()" resolve="getModelName" />
@@ -4605,9 +4605,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3mf03aPeYLi" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2nI" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3mf03aPeYLj" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2nJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4636,7 +4636,7 @@
                                 <node concept="1pGfFk" id="4rHwORqCibL" role="2ShVmc">
                                   <ref role="37wK5l" to="w1kc:~ModelImports.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel)" resolve="ModelImports" />
                                   <node concept="37vLTw" id="4rHwORqCiL8" role="37wK5m">
-                                    <ref role="3cqZAo" node="3mf03aPetVQ" resolve="model" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2nO" resolve="model" />
                                   </node>
                                 </node>
                               </node>
@@ -4670,7 +4670,7 @@
                                         <node concept="3JPx81" id="3mf03aPi3Xm" role="2OqNvi">
                                           <node concept="2OqwBi" id="3mf03aPi3Xn" role="25WWJ7">
                                             <node concept="37vLTw" id="3mf03aPi3Xp" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3mf03aPi3Xs" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2nK" resolve="it" />
                                             </node>
                                             <node concept="liA8E" id="3mf03aPi3Xr" role="2OqNvi">
                                               <ref role="37wK5l" to="mhbf:~SModelReference.getModelName()" resolve="getModelName" />
@@ -4680,9 +4680,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3mf03aPi3Xs" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2nK" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3mf03aPi3Xt" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2nL" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -4701,26 +4701,26 @@
                                   <node concept="3clFbF" id="3mf03aPfeS9" role="3cqZAp">
                                     <node concept="1Ls8ON" id="3mf03aPfeS8" role="3clFbG">
                                       <node concept="37vLTw" id="3mf03aPfji1" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPetVQ" resolve="model" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2nO" resolve="model" />
                                       </node>
                                       <node concept="37vLTw" id="3mf03aPfi9$" role="1Lso8e">
-                                        <ref role="3cqZAo" node="3mf03aPfdMR" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2nM" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3mf03aPfdMR" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2nM" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3mf03aPfdMS" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2nN" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPetVQ" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2nO" role="1bW2Oz">
                         <property role="TrG5h" value="model" />
-                        <node concept="2jxLKc" id="3mf03aPetVR" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2nP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4892,15 +4892,15 @@
                             </node>
                             <node concept="3JPx81" id="4AXwGoM$VNr" role="2OqNvi">
                               <node concept="37vLTw" id="4AXwGoM$VX6" role="25WWJ7">
-                                <ref role="3cqZAo" node="4AXwGoM$NWv" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2nQ" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4AXwGoM$NWv" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2nQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4AXwGoM$NWw" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2nR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/intentions.mps
index 8ded9cabc04..9b0a3964c45 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/intentions.mps
@@ -74,7 +74,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -83,6 +83,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -127,7 +128,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -141,7 +142,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -263,16 +263,16 @@
                               </node>
                               <node concept="3JPx81" id="3mf03aPESiD" role="2OqNvi">
                                 <node concept="37vLTw" id="3mf03aPESp0" role="25WWJ7">
-                                  <ref role="3cqZAo" node="3mf03aPER3T" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2nS" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPER3T" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2nS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3mf03aPER3U" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2nT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -299,7 +299,7 @@
                         <node concept="37vLTI" id="3mf03aPFd97" role="3clFbG">
                           <node concept="2OqwBi" id="3mf03aPFkcX" role="37vLTx">
                             <node concept="37vLTw" id="3mf03aPFdnB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3mf03aPF4pV" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2nU" resolve="it" />
                             </node>
                             <node concept="liA8E" id="3mf03aPFmxF" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SModel.getModelName()" resolve="getModelName" />
@@ -321,9 +321,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3mf03aPF4pV" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2nU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3mf03aPF4pW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2nV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -443,14 +443,14 @@
                         <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                         <ref role="37wK5l" to="95bo:3mf03aPwVhm" resolve="getId" />
                         <node concept="37vLTw" id="3mf03aPW2zO" role="37wK5m">
-                          <ref role="3cqZAo" node="3mf03aPW2zP" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2nW" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3mf03aPW2zP" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2nW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3mf03aPW2zQ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2nX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -502,7 +502,7 @@
                                   <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                                   <ref role="37wK5l" to="95bo:3mf03aPybFn" resolve="getId" />
                                   <node concept="37vLTw" id="3mf03aPWeyD" role="37wK5m">
-                                    <ref role="3cqZAo" node="3mf03aPW76z" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2nY" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -510,9 +510,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPW76z" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2nY" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3mf03aPW76$" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2nZ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -540,7 +540,7 @@
                           <node concept="2OqwBi" id="3mf03aPWzW1" role="37vLTx">
                             <node concept="2OqwBi" id="3mf03aPWy2j" role="2Oq$k0">
                               <node concept="37vLTw" id="3mf03aPWwzw" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3mf03aPVNhf" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2o0" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3mf03aPWzsy" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
@@ -566,9 +566,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3mf03aPVNhf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2o0" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3mf03aPVNhg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2o1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -688,14 +688,14 @@
                         <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                         <ref role="37wK5l" to="95bo:3mf03aPwVhm" resolve="getId" />
                         <node concept="37vLTw" id="3mf03aPWG01" role="37wK5m">
-                          <ref role="3cqZAo" node="3mf03aPWG02" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2o2" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3mf03aPWG02" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2o2" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3mf03aPWG03" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2o3" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -747,7 +747,7 @@
                                   <ref role="37wK5l" to="95bo:3mf03aPy5a_" resolve="getId" />
                                   <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                                   <node concept="37vLTw" id="3mf03aPWMjE" role="37wK5m">
-                                    <ref role="3cqZAo" node="3mf03aPWHoT" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2o4" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -755,9 +755,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mf03aPWHoT" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2o4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3mf03aPWHoU" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2o5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -785,7 +785,7 @@
                           <node concept="2OqwBi" id="3mf03aPWHp6" role="37vLTx">
                             <node concept="2OqwBi" id="3mf03aPWHp7" role="2Oq$k0">
                               <node concept="37vLTw" id="3mf03aPWHp8" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3mf03aPWHpg" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2o6" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3mf03aPWOx4" role="2OqNvi">
                                 <ref role="37wK5l" to="lui2:~SDependency.getTargetModule()" resolve="getTargetModule" />
@@ -811,9 +811,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3mf03aPWHpg" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2o6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3mf03aPWHph" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2o7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -934,14 +934,14 @@
                         <ref role="37wK5l" to="95bo:3mf03aPwVhm" resolve="getId" />
                         <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                         <node concept="37vLTw" id="7Pfa1XGjBwd" role="37wK5m">
-                          <ref role="3cqZAo" node="7Pfa1XGjBwe" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2o8" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7Pfa1XGjBwe" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2o8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7Pfa1XGjBwf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2o9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -994,7 +994,7 @@
                                     <ref role="37wK5l" to="95bo:3mf03aPy5a_" resolve="getId" />
                                     <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                                     <node concept="37vLTw" id="7Pfa1XGjBwD" role="37wK5m">
-                                      <ref role="3cqZAo" node="7Pfa1XGjBwE" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2oa" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -1002,9 +1002,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7Pfa1XGjBwE" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2oa" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7Pfa1XGjBwF" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2ob" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1018,7 +1018,7 @@
                               <node concept="2OqwBi" id="7Pfa1XGjU1C" role="2Oq$k0">
                                 <node concept="2OqwBi" id="7Pfa1XGjRsP" role="2Oq$k0">
                                   <node concept="37vLTw" id="7Pfa1XGjQvE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7Pfa1XGjNIk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2oc" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="7Pfa1XGjTyC" role="2OqNvi">
                                     <ref role="37wK5l" to="lui2:~SDependency.getTargetModule()" resolve="getTargetModule" />
@@ -1038,9 +1038,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7Pfa1XGjNIk" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2oc" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7Pfa1XGjNIl" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2od" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1068,7 +1068,7 @@
                           <node concept="2OqwBi" id="7Pfa1XGjBwR" role="37vLTx">
                             <node concept="2OqwBi" id="7Pfa1XGjBwS" role="2Oq$k0">
                               <node concept="37vLTw" id="7Pfa1XGjBwT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7Pfa1XGjBx1" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2oe" resolve="it" />
                               </node>
                               <node concept="liA8E" id="7Pfa1XGjBwU" role="2OqNvi">
                                 <ref role="37wK5l" to="lui2:~SDependency.getTargetModule()" resolve="getTargetModule" />
@@ -1094,9 +1094,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Pfa1XGjBx1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2oe" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Pfa1XGjBx2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2of" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1217,14 +1217,14 @@
                         <ref role="37wK5l" to="95bo:3mf03aPwVhm" resolve="getId" />
                         <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                         <node concept="37vLTw" id="7Pfa1XGjBxT" role="37wK5m">
-                          <ref role="3cqZAo" node="7Pfa1XGjBxU" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2og" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7Pfa1XGjBxU" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2og" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7Pfa1XGjBxV" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2oh" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1277,7 +1277,7 @@
                                     <ref role="37wK5l" to="95bo:3mf03aPybFn" resolve="getId" />
                                     <ref role="1Pybhc" to="95bo:77UHMYYRMi8" resolve="DependenciesDiagramHelper" />
                                     <node concept="37vLTw" id="7Pfa1XGjByl" role="37wK5m">
-                                      <ref role="3cqZAo" node="7Pfa1XGjBym" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2oi" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -1285,9 +1285,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7Pfa1XGjBym" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2oi" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7Pfa1XGjByn" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2oj" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1301,7 +1301,7 @@
                               <node concept="2OqwBi" id="7Pfa1XGkoO$" role="2Oq$k0">
                                 <node concept="2OqwBi" id="7Pfa1XGkoO_" role="2Oq$k0">
                                   <node concept="37vLTw" id="7Pfa1XGkoOA" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7Pfa1XGkoOF" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ok" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="7Pfa1XGkoOB" role="2OqNvi">
                                     <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
@@ -1321,9 +1321,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7Pfa1XGkoOF" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ok" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7Pfa1XGkoOG" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2ol" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1351,7 +1351,7 @@
                           <node concept="2OqwBi" id="7Pfa1XGjByz" role="37vLTx">
                             <node concept="2OqwBi" id="7Pfa1XGjBy$" role="2Oq$k0">
                               <node concept="37vLTw" id="7Pfa1XGjBy_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7Pfa1XGjByH" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2om" resolve="it" />
                               </node>
                               <node concept="liA8E" id="7Pfa1XGjByA" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
@@ -1377,9 +1377,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Pfa1XGjByH" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2om" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Pfa1XGjByI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2on" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/structure.mps
index f2dcc178837..c0a0178e506 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/structure.mps
@@ -32,7 +32,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/typesystem.mps
index 9d05d43448e..ca0f89540d3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/typesystem.mps
@@ -42,6 +42,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -77,7 +78,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -87,7 +88,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -125,16 +125,16 @@
                               <node concept="1Wc70l" id="6GbYcWoxfZH" role="3clFbG">
                                 <node concept="3y3z36" id="6GbYcWoxgws" role="3uHU7B">
                                   <node concept="37vLTw" id="6GbYcWoxgWB" role="3uHU7w">
-                                    <ref role="3cqZAo" node="6GbYcWowq2u" resolve="inner" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2oo" resolve="inner" />
                                   </node>
                                   <node concept="37vLTw" id="6GbYcWoxggU" role="3uHU7B">
-                                    <ref role="3cqZAo" node="6GbYcWowq2w" resolve="outer" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2oq" resolve="outer" />
                                   </node>
                                 </node>
                                 <node concept="17R0WA" id="6GbYcWowq2n" role="3uHU7w">
                                   <node concept="2OqwBi" id="6GbYcWowq2o" role="3uHU7w">
                                     <node concept="37vLTw" id="6GbYcWowq2p" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6GbYcWowq2u" resolve="inner" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2oo" resolve="inner" />
                                     </node>
                                     <node concept="3TrcHB" id="6GbYcWowq2q" role="2OqNvi">
                                       <ref role="3TsBF5" to="hypd:1AZH1sZHi4e" resolve="qualifiedName" />
@@ -142,7 +142,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="6GbYcWowq2r" role="3uHU7B">
                                     <node concept="37vLTw" id="6GbYcWowq2s" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6GbYcWowq2w" resolve="outer" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2oq" resolve="outer" />
                                     </node>
                                     <node concept="3TrcHB" id="6GbYcWowq2t" role="2OqNvi">
                                       <ref role="3TsBF5" to="hypd:1AZH1sZHi4e" resolve="qualifiedName" />
@@ -152,18 +152,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6GbYcWowq2u" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2oo" role="1bW2Oz">
                             <property role="TrG5h" value="inner" />
-                            <node concept="2jxLKc" id="6GbYcWowq2v" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2op" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6GbYcWowq2w" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2oq" role="1bW2Oz">
                   <property role="TrG5h" value="outer" />
-                  <node concept="2jxLKc" id="6GbYcWowq2x" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2or" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -175,7 +175,7 @@
                   <node concept="3cpWs3" id="6GbYcWowASo" role="2MkJ7o">
                     <node concept="2OqwBi" id="6GbYcWowASp" role="3uHU7w">
                       <node concept="37vLTw" id="6GbYcWowASq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6GbYcWowASu" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2os" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="6GbYcWowASr" role="2OqNvi">
                         <ref role="3TsBF5" to="hypd:1AZH1sZHi4e" resolve="qualifiedName" />
@@ -186,13 +186,13 @@
                     </node>
                   </node>
                   <node concept="37vLTw" id="6GbYcWowASt" role="1urrMF">
-                    <ref role="3cqZAo" node="6GbYcWowASu" resolve="it" />
+                    <ref role="3cqZAo" node="2SR9xrsN2os" resolve="it" />
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6GbYcWowASu" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2os" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="6GbYcWowASv" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2ot" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -230,16 +230,16 @@
                               <node concept="1Wc70l" id="6GbYcWoxhdi" role="3clFbG">
                                 <node concept="3y3z36" id="6GbYcWoxhFN" role="3uHU7B">
                                   <node concept="37vLTw" id="6GbYcWoxhW7" role="3uHU7w">
-                                    <ref role="3cqZAo" node="6GbYcWowv9A" resolve="inner" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ou" resolve="inner" />
                                   </node>
                                   <node concept="37vLTw" id="6GbYcWoxhsh" role="3uHU7B">
-                                    <ref role="3cqZAo" node="6GbYcWowv9C" resolve="outer" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ow" resolve="outer" />
                                   </node>
                                 </node>
                                 <node concept="17R0WA" id="6GbYcWowv9v" role="3uHU7w">
                                   <node concept="2OqwBi" id="6GbYcWowv9w" role="3uHU7w">
                                     <node concept="37vLTw" id="6GbYcWowv9x" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6GbYcWowv9A" resolve="inner" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2ou" resolve="inner" />
                                     </node>
                                     <node concept="3TrcHB" id="6GbYcWowv9y" role="2OqNvi">
                                       <ref role="3TsBF5" to="hypd:5xDtKQA7vSI" resolve="qualifiedName" />
@@ -247,7 +247,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="6GbYcWowv9z" role="3uHU7B">
                                     <node concept="37vLTw" id="6GbYcWowv9$" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6GbYcWowv9C" resolve="outer" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2ow" resolve="outer" />
                                     </node>
                                     <node concept="3TrcHB" id="6GbYcWowv9_" role="2OqNvi">
                                       <ref role="3TsBF5" to="hypd:5xDtKQA7vSI" resolve="qualifiedName" />
@@ -257,18 +257,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6GbYcWowv9A" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2ou" role="1bW2Oz">
                             <property role="TrG5h" value="inner" />
-                            <node concept="2jxLKc" id="6GbYcWowv9B" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2ov" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6GbYcWowv9C" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ow" role="1bW2Oz">
                   <property role="TrG5h" value="outer" />
-                  <node concept="2jxLKc" id="6GbYcWowv9D" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ox" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -280,7 +280,7 @@
                   <node concept="3cpWs3" id="6GbYcWowBf6" role="2MkJ7o">
                     <node concept="2OqwBi" id="6GbYcWowBf7" role="3uHU7w">
                       <node concept="37vLTw" id="6GbYcWowBf8" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6GbYcWowBfc" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2oy" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="6GbYcWowBf9" role="2OqNvi">
                         <ref role="3TsBF5" to="hypd:5xDtKQA7vSI" resolve="qualifiedName" />
@@ -291,13 +291,13 @@
                     </node>
                   </node>
                   <node concept="37vLTw" id="6GbYcWowBfb" role="1urrMF">
-                    <ref role="3cqZAo" node="6GbYcWowBfc" resolve="it" />
+                    <ref role="3cqZAo" node="2SR9xrsN2oy" resolve="it" />
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6GbYcWowBfc" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2oy" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="6GbYcWowBfd" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2oz" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel.mpl
index 108ce64ebc0..953111ab663 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/generator/template/main@generator.mps
index 33324a5d492..0545ee12f2c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps
index ec2d5c02183..d3bff1a414e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -87,7 +87,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/com.mbeddr.mpsutil.ecore.testing.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/com.mbeddr.mpsutil.ecore.testing.mpl
index 2f847115671..8a00de2aa2e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/com.mbeddr.mpsutil.ecore.testing.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/com.mbeddr.mpsutil.ecore.testing.mpl
@@ -33,7 +33,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -67,7 +67,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
@@ -76,7 +75,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/editor.mps
index bdac6c2cca3..1ab55a727e4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/editor.mps
@@ -40,7 +40,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/structure.mps
index 6ae00c1cd77..cf13b3ce28d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.testing/models/com/mbeddr/mpsutil/ecore/testing/structure.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/com.mbeddr.mpsutil.ecore.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/com.mbeddr.mpsutil.ecore.mpl
index 943fd3f642d..7dc81d0c594 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/com.mbeddr.mpsutil.ecore.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/com.mbeddr.mpsutil.ecore.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">77948de3-6ef9-452d-b392-d01403e4086f(com.mbeddr.mpsutil.ecore)</dependency>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/behavior.mps
index b824b208501..6b11b94c765 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/behavior.mps
@@ -40,13 +40,13 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/editor.mps
index a91733c7802..966cadcfb0f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/editor.mps
@@ -34,7 +34,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -63,7 +63,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/structure.mps
index fd9b08631eb..09afaa30f0b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoreimporter.util/models/com/mbeddr/mpsutil/ecore/structure.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.mpl
index 565c08629d2..036861eb82c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">77948de3-6ef9-452d-b392-d01403e4086f(com.mbeddr.mpsutil.ecore)</dependency>
   </dependencies>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps
index 5c871fc7c16..87b99410513 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps
@@ -91,7 +91,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/com.mbeddr.mpsutil.ecoretransofmation.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/com.mbeddr.mpsutil.ecoretransofmation.sandbox.mpl
index c778939458f..625cac06361 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/com.mbeddr.mpsutil.ecoretransofmation.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/com.mbeddr.mpsutil.ecoretransofmation.sandbox.mpl
@@ -11,14 +11,13 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/models/structure.mps
index febfd2a9837..c57eda2f53f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox/models/structure.mps
@@ -6,7 +6,7 @@
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="d3a0fd26-445a-466c-900e-10444ddfed52" name="com.mbeddr.mpsutil.filepicker" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -56,7 +56,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl
index c749128cadc..00dcd736f0a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">28182ab7-63b2-4f3b-8b5f-ce0a1f88fa81(com.mbeddr.mpsutil.editingGuide.execution)</dependency>
     <dependency reexport="false">c6e0a639-6829-4d71-a41c-9d693d7cdea5(com.mbeddr.mpsutil.editingGuide.runtime)</dependency>
@@ -29,7 +28,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/models/editor.mps
index d67c8007abc..a1750fc7964 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/models/editor.mps
@@ -90,7 +90,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -115,7 +115,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -157,7 +157,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -265,7 +265,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -282,7 +282,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="3066917033203108594" name="jetbrains.mps.baseLanguage.structure.LocalInstanceMethodCall" flags="nn" index="3P9mCS" />
@@ -387,7 +387,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl
index df8e457d9a9..778ca941afa 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl
@@ -30,7 +30,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -70,7 +70,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
@@ -93,7 +92,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -114,7 +113,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/generator/template/main@generator.mps
index 50872ea4484..4b556921b97 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/generator/template/main@generator.mps
@@ -46,7 +46,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -56,7 +56,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -127,7 +127,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/behavior.mps
index c0f776328da..049de4ef40a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/behavior.mps
@@ -56,7 +56,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -148,7 +148,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -169,7 +169,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -192,6 +192,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -310,7 +311,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -344,7 +345,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -420,7 +420,7 @@
                   <node concept="3clFbF" id="4TMjSvbGa0A" role="3cqZAp">
                     <node concept="2OqwBi" id="4TMjSvbGa46" role="3clFbG">
                       <node concept="37vLTw" id="4TMjSvbGa0_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4TMjSvbG9WZ" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2oE" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="4TMjSvbGac3" role="2OqNvi">
                         <ref role="3TsBF5" to="k8go:3p1cdQ7_d_S" resolve="isDone" />
@@ -428,9 +428,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4TMjSvbG9WZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2oE" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4TMjSvbG9X0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2oF" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -479,7 +479,7 @@
                     <node concept="3fqX7Q" id="4TMjSvbGdba" role="3clFbG">
                       <node concept="2OqwBi" id="4TMjSvbGdbb" role="3fr31v">
                         <node concept="37vLTw" id="4TMjSvbGdbc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4TMjSvbGdbe" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2oG" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="4TMjSvbGdbd" role="2OqNvi">
                           <ref role="3TsBF5" to="k8go:3p1cdQ7_d_S" resolve="isDone" />
@@ -488,9 +488,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4TMjSvbGdbe" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2oG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4TMjSvbGdbf" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2oH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1319,7 +1319,7 @@
                     <node concept="3clFbF" id="PYICs110vC" role="3cqZAp">
                       <node concept="2OqwBi" id="PYICs110vD" role="3clFbG">
                         <node concept="37vLTw" id="PYICs110vE" role="2Oq$k0">
-                          <ref role="3cqZAo" node="PYICs110vH" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2oI" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="PYICs110vF" role="2OqNvi">
                           <ref role="37wK5l" node="22irgSmHAOg" resolve="getProvidedNodes" />
@@ -1330,9 +1330,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="PYICs110vH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2oI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="PYICs110vI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2oJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/constraints.mps
index 47da27793b3..b8a8c8d60c4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/constraints.mps
@@ -23,7 +23,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -70,7 +70,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,7 +79,7 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -107,6 +107,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -148,7 +149,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -167,7 +168,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
@@ -390,16 +390,16 @@
                                   </node>
                                   <node concept="3JPx81" id="4fWdCdB3bR0" role="2OqNvi">
                                     <node concept="37vLTw" id="4fWdCdB3bR1" role="25WWJ7">
-                                      <ref role="3cqZAo" node="4fWdCdB3abA" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2oK" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4fWdCdB3abA" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2oK" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4fWdCdB3abB" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2oL" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -414,7 +414,7 @@
                                   <ref role="cht4Q" to="k8go:44LrdWQ3eCt" resolve="INodeExporter" />
                                 </node>
                                 <node concept="37vLTw" id="4fWdCdAZMpu" role="1m5AlR">
-                                  <ref role="3cqZAo" node="4fWdCdAZM0C" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2oM" resolve="it" />
                                 </node>
                               </node>
                               <node concept="2qgKlT" id="4fWdCdB0yhR" role="2OqNvi">
@@ -426,9 +426,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4fWdCdAZM0C" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2oM" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4fWdCdAZM0D" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2oN" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/editor.mps
index f2576d69299..31e948fc356 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/editor.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="04e1f940-330e-483b-9a6a-1648b396a81c" name="com.mbeddr.mpsutil.hyperlink" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -97,7 +97,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -127,7 +127,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -208,7 +208,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -224,7 +224,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -279,7 +279,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/intentions.mps
index 7d1b34b721b..900bb0a29c1 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/intentions.mps
@@ -55,7 +55,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
index d4a76dcee33..10a8c75bf71 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
@@ -70,7 +70,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/typesystem.mps
index a81283b4686..125afc233aa 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/typesystem.mps
@@ -51,7 +51,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -109,7 +109,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl
index d2c131401f7..a63b438a923 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.behavior.mps
index 8c8d640c51f..6f84484f575 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.behavior.mps
@@ -46,13 +46,13 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -67,7 +67,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.editor.mps
index 1a6d9031f3e..61c33a3e605 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.editor.mps
@@ -46,7 +46,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1176474535556" name="jetbrains.mps.lang.editor.structure.QueryFunction_JComponent" flags="in" index="3Fmcul" />
@@ -60,7 +60,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -109,7 +109,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -121,7 +121,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -133,7 +133,7 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.listeners.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.listeners.mps
index 213204569d0..9d17f07e4f9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.listeners.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.listeners.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps
index e78669a3924..c8bd457bb6b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps
@@ -28,7 +28,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.sandbox.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.sandbox.msd
index 004ebe7cfb2..3c6faedfc8f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.editor.displayControl.sandbox.sandbox" uuid="fd5fd64f-cbc2-4cf5-b0c1-92d10acc6a5a" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.editor.displayControl.sandbox.sandbox" uuid="fd5fd64f-cbc2-4cf5-b0c1-92d10acc6a5a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:5fef253e-34b0-443d-8035-9a2928b716d3:com.mbeddr.mpsutil.editor.displayControl" version="0" />
     <language slang="l:c3a9b5df-25f0-466c-a31c-0da4314af7d1:com.mbeddr.mpsutil.editor.displayControl.sandbox" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/com.mbeddr.mpsutil.editor.displayControl.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/com.mbeddr.mpsutil.editor.displayControl.mpl
index 2b7e85ce926..8dd32efba48 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/com.mbeddr.mpsutil.editor.displayControl.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/com.mbeddr.mpsutil.editor.displayControl.mpl
@@ -11,33 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.mpsutil.editor.displayControl.generator" uuid="7baca8d9-1e65-4b72-acc7-0b1a931f21a4">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions />
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="5fef253e-34b0-443d-8035-9a2928b716d3(com.mbeddr.mpsutil.editor.displayControl)" version="0" />
-        <module reference="7baca8d9-1e65-4b72-acc7-0b1a931f21a4(com.mbeddr.mpsutil.editor.displayControl.generator)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
   </dependencies>
@@ -45,7 +18,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.behavior.mps
index fae1f1948e6..a8030d82563 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.behavior.mps
@@ -76,7 +76,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -87,7 +87,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -122,7 +122,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.structure.mps
index b7391afad8c..80c4c473130 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl/models/com.mbeddr.mpsutil.editor.displayControl.structure.mps
@@ -14,7 +14,7 @@
       <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/com.mbeddr.mpsutil.extensionclass.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/com.mbeddr.mpsutil.extensionclass.mpl
index d43b35f076d..d7f27e2e300 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/com.mbeddr.mpsutil.extensionclass.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/com.mbeddr.mpsutil.extensionclass.mpl
@@ -34,7 +34,7 @@
         <language slang="l:f39336d3-1288-47ee-bbfe-ad2ea7e4504e:com.mbeddr.mpsutil.extensionclass" version="1" />
         <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:5dc5fc0d-37ef-4782-8192-8b5ce1f69f80:jetbrains.mps.baseLanguage.extensionMethods" version="0" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -96,7 +96,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
@@ -110,7 +109,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -131,7 +130,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/generator/template/main@generator.mps
index 6b941b3a7aa..a250cb2ba48 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/generator/template/main@generator.mps
@@ -59,11 +59,11 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -141,7 +141,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/behavior.mps
index c3a72c738bf..356c18f2aac 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/behavior.mps
@@ -110,7 +110,7 @@
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -122,7 +122,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -136,13 +136,14 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
       <concept id="1196350785112" name="jetbrains.mps.lang.quotation.structure.Antiquotation" flags="ng" index="2c44te" />
@@ -206,8 +207,8 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1234971358450" name="jetbrains.mps.lang.core.structure.IType" flags="ng" index="2a1RnH" />
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1234971358450" name="jetbrains.mps.lang.core.structure.IType" flags="ngI" index="2a1RnH" />
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -231,7 +232,6 @@
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1227026094155" name="jetbrains.mps.baseLanguage.collections.structure.RemoveLastElementOperation" flags="nn" index="2Kt5_m" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -383,16 +383,16 @@
                             </node>
                             <node concept="2OqwBi" id="4X7wieqqixz" role="3uHU7B">
                               <node concept="37vLTw" id="4X7wieqqhdF" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4X7wieqqfTS" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2oQ" resolve="it" />
                               </node>
                               <node concept="2bSWHS" id="4X7wieqqj8J" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4X7wieqqfTS" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2oQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4X7wieqqfTT" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2oR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -403,7 +403,7 @@
                       <node concept="3clFbF" id="6ffEDrb$cbE" role="3cqZAp">
                         <node concept="2OqwBi" id="6ffEDrb$cbF" role="3clFbG">
                           <node concept="37vLTw" id="2BHiRxgm9k3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6ffEDrb$cbI" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2oS" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6ffEDrb$cbH" role="2OqNvi">
                             <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -411,9 +411,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6ffEDrb$cbI" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2oS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6ffEDrb$cbJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2oT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -690,7 +690,7 @@
                         </node>
                         <node concept="2OqwBi" id="4X7wieq_7I$" role="3uHU7B">
                           <node concept="37vLTw" id="4X7wieq_7I_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4X7wieq_7IB" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2oU" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4X7wieq_7IA" role="2OqNvi">
                             <ref role="3Tt5mk" to="sh3l:4X7wieq8jk6" resolve="class" />
@@ -699,9 +699,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4X7wieq_7IB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2oU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4X7wieq_7IC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2oV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -748,16 +748,16 @@
                               </node>
                               <node concept="2OqwBi" id="4X7wieq$T_c" role="3uHU7B">
                                 <node concept="37vLTw" id="4X7wieq$Tqr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4X7wieq$Tib" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2oW" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="4X7wieq$U65" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4X7wieq$Tib" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2oW" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4X7wieq$Tic" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2oX" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -771,7 +771,7 @@
                               <node concept="2OqwBi" id="6tcu$9ntuXc" role="3uHU7B">
                                 <node concept="2OqwBi" id="4X7wieq_8uB" role="2Oq$k0">
                                   <node concept="37vLTw" id="4X7wieq_8jt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4X7wieq$VNC" resolve="param" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2oY" resolve="param" />
                                   </node>
                                   <node concept="3TrEf2" id="4X7wieq_97v" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -786,7 +786,7 @@
                             <node concept="BsUDl" id="4X7wieqC0Nw" role="3uHU7w">
                               <ref role="37wK5l" node="4X7wieqBRAN" resolve="getParameterName" />
                               <node concept="37vLTw" id="4X7wieqC0ZF" role="37wK5m">
-                                <ref role="3cqZAo" node="4X7wieq$VNC" resolve="param" />
+                                <ref role="3cqZAo" node="2SR9xrsN2oY" resolve="param" />
                               </node>
                               <node concept="37vLTw" id="4X7wieqC1jO" role="37wK5m">
                                 <ref role="3cqZAo" node="4X7wieq_7Ih" resolve="extensionClass" />
@@ -795,9 +795,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4X7wieq$VNC" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2oY" role="1bW2Oz">
                         <property role="TrG5h" value="param" />
-                        <node concept="2jxLKc" id="4X7wieq$VND" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2oZ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -878,7 +878,7 @@
                         </node>
                         <node concept="2OqwBi" id="4X7wieqC51c" role="3uHU7B">
                           <node concept="37vLTw" id="4X7wieqC51d" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4X7wieqC51f" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2p0" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4X7wieqC51e" role="2OqNvi">
                             <ref role="3Tt5mk" to="sh3l:4X7wieqsg3V" resolve="method" />
@@ -887,9 +887,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4X7wieqC51f" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2p0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4X7wieqC51g" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2p1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -969,16 +969,16 @@
                         </node>
                         <node concept="2OqwBi" id="4X7wieqC4vI" role="3uHU7B">
                           <node concept="37vLTw" id="4X7wieqC4vJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4X7wieqC4vL" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2p2" resolve="it" />
                           </node>
                           <node concept="2bSWHS" id="Pu8Vy2bdn4" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4X7wieqC4vL" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2p2" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4X7wieqC4vM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2p3" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/constraints.mps
index bd6970721a3..fa61dcf5adb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/constraints.mps
@@ -28,7 +28,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -99,7 +99,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -117,7 +117,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -160,6 +160,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -219,7 +220,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -246,7 +247,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -702,7 +702,7 @@
                         <node concept="3clFbF" id="2lop6rSg8zI" role="3cqZAp">
                           <node concept="1PxgMI" id="2lop6rSg8zJ" role="3clFbG">
                             <node concept="37vLTw" id="2lop6rSg8zK" role="1m5AlR">
-                              <ref role="3cqZAo" node="2lop6rSg8zM" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2p4" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="2lop6rSg8zL" role="3oSUPX">
                               <ref role="cht4Q" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
@@ -710,9 +710,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2lop6rSg8zM" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2p4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2lop6rSg8zN" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2p5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -726,14 +726,14 @@
                           <ref role="1Pybhc" to="fnmy:2Jvt1sWfuv6" resolve="VisibilityUtil" />
                           <node concept="2rP1CM" id="2lop6rSg8zT" role="37wK5m" />
                           <node concept="37vLTw" id="2lop6rSg8zU" role="37wK5m">
-                            <ref role="3cqZAo" node="2lop6rSg8zV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2p6" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2lop6rSg8zV" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2p6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2lop6rSg8zW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2p7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/editor.mps
index a9a08919b4a..1a1e9b899a7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/editor.mps
@@ -20,7 +20,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -85,7 +85,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -98,7 +98,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -125,7 +125,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -221,7 +221,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -233,7 +233,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -260,6 +260,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -267,7 +268,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -324,7 +325,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -332,7 +333,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
@@ -645,7 +645,7 @@
                       <node concept="17R0WA" id="2Fugwv5G2n7" role="3uHU7w">
                         <node concept="2OqwBi" id="LBlPJUzjy0" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxgmtw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2p8" resolve="it" />
                           </node>
                           <node concept="2NL2c5" id="2Fugwv5FurA" role="2OqNvi" />
                         </node>
@@ -660,7 +660,7 @@
                         </node>
                         <node concept="2OqwBi" id="LBlPJUzjy4" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxglFWd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2p8" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="LBlPJUzjy6" role="2OqNvi" />
                         </node>
@@ -668,9 +668,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="LBlPJUzjy9" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2p8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1P4c1XrzTlB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2p9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -807,7 +807,7 @@
                         </node>
                         <node concept="2OqwBi" id="4X7wieqwHaE" role="3uHU7B">
                           <node concept="37vLTw" id="4X7wieqwHaF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4X7wieqwHaH" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2pa" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4X7wieqwHaG" role="2OqNvi">
                             <ref role="3Tt5mk" to="sh3l:4X7wieq8jk6" resolve="class" />
@@ -816,9 +816,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4X7wieqwHaH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2pa" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4X7wieqwHaI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2pb" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -851,7 +851,7 @@
                         </node>
                         <node concept="2OqwBi" id="4X7wieqwNLV" role="3uHU7B">
                           <node concept="37vLTw" id="4X7wieqwNLW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4X7wieqwNLY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2pc" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4X7wieqwNLX" role="2OqNvi">
                             <ref role="3Tt5mk" to="sh3l:4X7wieqsg3V" resolve="method" />
@@ -860,9 +860,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4X7wieqwNLY" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2pc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4X7wieqwNLZ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2pd" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -981,16 +981,16 @@
                       </node>
                       <node concept="2OqwBi" id="4X7wieqlYBP" role="3uHU7B">
                         <node concept="37vLTw" id="4X7wieqlYp8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4X7wieqlYc1" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2pe" resolve="it" />
                         </node>
                         <node concept="2bSWHS" id="4X7wieqlZfD" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4X7wieqlYc1" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2pe" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4X7wieqlYc2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2pf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1296,7 +1296,7 @@
                                   <node concept="3cpWs3" id="3Q2hMLtMjzU" role="3clFbG">
                                     <node concept="2OqwBi" id="3Q2hMLtMjzV" role="3uHU7w">
                                       <node concept="37vLTw" id="3Q2hMLtMjzW" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3Q2hMLtMj$3" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2pg" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="3Q2hMLtMjzX" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1306,7 +1306,7 @@
                                       <node concept="2OqwBi" id="6tcu$9ntuYa" role="3uHU7B">
                                         <node concept="2OqwBi" id="3Q2hMLtMjzZ" role="2Oq$k0">
                                           <node concept="37vLTw" id="3Q2hMLtMj$0" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3Q2hMLtMj$3" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2pg" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="3Q2hMLtMj$1" role="2OqNvi">
                                             <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -1321,9 +1321,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3Q2hMLtMj$3" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2pg" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3Q2hMLtMj$4" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2ph" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1444,7 +1444,7 @@
                                   <node concept="3cpWs3" id="3Q2hMLtMj$v" role="3clFbG">
                                     <node concept="2OqwBi" id="3Q2hMLtMj$w" role="3uHU7w">
                                       <node concept="37vLTw" id="3Q2hMLtMj$x" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3Q2hMLtMj$C" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2pi" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="3Q2hMLtMj$y" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1454,7 +1454,7 @@
                                       <node concept="2OqwBi" id="6tcu$9ntuZb" role="3uHU7B">
                                         <node concept="2OqwBi" id="3Q2hMLtMj$$" role="2Oq$k0">
                                           <node concept="37vLTw" id="3Q2hMLtMj$_" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3Q2hMLtMj$C" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2pi" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="3Q2hMLtMj$A" role="2OqNvi">
                                             <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -1469,9 +1469,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3Q2hMLtMj$C" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2pi" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3Q2hMLtMj$D" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2pj" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1547,7 +1547,7 @@
                             <node concept="3cpWs3" id="3Q2hMLtKp9d" role="3clFbG">
                               <node concept="2OqwBi" id="3Q2hMLtKp9e" role="3uHU7w">
                                 <node concept="37vLTw" id="3Q2hMLtKp9f" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3Q2hMLtKp9m" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2pk" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="3Q2hMLtKp9g" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1557,7 +1557,7 @@
                                 <node concept="2OqwBi" id="6tcu$9ntv01" role="3uHU7B">
                                   <node concept="2OqwBi" id="3Q2hMLtKp9i" role="2Oq$k0">
                                     <node concept="37vLTw" id="3Q2hMLtKp9j" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3Q2hMLtKp9m" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2pk" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3Q2hMLtKp9k" role="2OqNvi">
                                       <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -1572,9 +1572,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3Q2hMLtKp9m" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2pk" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3Q2hMLtKp9n" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2pl" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/intentions.mps
index 512e133cc52..673f385b4d9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/intentions.mps
@@ -56,7 +56,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -68,6 +68,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -123,7 +124,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -135,7 +136,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -195,7 +195,7 @@
                                 <node concept="2OqwBi" id="4X7wieqQJI3" role="3uHU7B">
                                   <node concept="2OqwBi" id="4X7wieqQEMn" role="2Oq$k0">
                                     <node concept="37vLTw" id="4X7wieqQEmJ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4X7wieqMWSy" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2po" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="4X7wieqQG9P" role="2OqNvi">
                                       <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
@@ -207,7 +207,7 @@
                               <node concept="2OqwBi" id="4X7wieqNdy_" role="3uHU7w">
                                 <node concept="2OqwBi" id="4X7wieqN40H" role="2Oq$k0">
                                   <node concept="37vLTw" id="4X7wieqN01e" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4X7wieqMWSy" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2po" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="4X7wieqN63h" role="2OqNvi">
                                     <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
@@ -220,7 +220,7 @@
                                         <node concept="2OqwBi" id="4X7wieqNvTd" role="3clFbG">
                                           <node concept="2OqwBi" id="4X7wieqNrE4" role="2Oq$k0">
                                             <node concept="37vLTw" id="4X7wieqNq3h" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4X7wieqNnfX" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2pm" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="4X7wieqNsvM" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -235,9 +235,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4X7wieqNnfX" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2pm" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4X7wieqNnfY" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2pn" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -245,9 +245,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4X7wieqMWSy" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2po" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4X7wieqMWSz" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2pp" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -263,7 +263,7 @@
                                 <ref role="2pIpSl" to="sh3l:4X7wieqsg3V" resolve="method" />
                                 <node concept="36biLy" id="4X7wieqOjWf" role="28nt2d">
                                   <node concept="37vLTw" id="4X7wieqOkni" role="36biLW">
-                                    <ref role="3cqZAo" node="4X7wieqO1_j" resolve="method" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2pu" resolve="method" />
                                   </node>
                                 </node>
                               </node>
@@ -274,7 +274,7 @@
                                     <node concept="2OqwBi" id="4X7wieqO_3C" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4X7wieqOv0c" role="2Oq$k0">
                                         <node concept="37vLTw" id="4X7wieqOuoY" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4X7wieqO1_j" resolve="method" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2pu" resolve="method" />
                                         </node>
                                         <node concept="3Tsc0h" id="4X7wieqOyrH" role="2OqNvi">
                                           <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
@@ -290,16 +290,16 @@
                                                 </node>
                                                 <node concept="2OqwBi" id="4X7wieqOKfv" role="3uHU7B">
                                                   <node concept="37vLTw" id="4X7wieqOJOH" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="4X7wieqOFMA" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2pq" resolve="it" />
                                                   </node>
                                                   <node concept="2bSWHS" id="4X7wieqOMp3" role="2OqNvi" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="4X7wieqOFMA" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN2pq" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="4X7wieqOFMB" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN2pr" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -328,9 +328,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="4X7wieqP0BI" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN2ps" role="1bW2Oz">
                                           <property role="TrG5h" value="param" />
-                                          <node concept="2jxLKc" id="4X7wieqP0BJ" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN2pt" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -341,9 +341,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4X7wieqO1_j" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2pu" role="1bW2Oz">
                         <property role="TrG5h" value="method" />
-                        <node concept="2jxLKc" id="4X7wieqO1_k" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2pv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -355,7 +355,7 @@
                         <node concept="2OqwBi" id="4X7wieqRBhT" role="3clFbG">
                           <node concept="2OqwBi" id="4X7wieqRx04" role="2Oq$k0">
                             <node concept="37vLTw" id="4X7wieqRwGD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4X7wieqRvXm" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2pw" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4X7wieqR_TG" role="2OqNvi">
                               <ref role="3Tt5mk" to="sh3l:4X7wieqsg3V" resolve="method" />
@@ -367,9 +367,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4X7wieqRvXm" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2pw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4X7wieqRvXn" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2px" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="4X7wieqRvXo" role="2S7zOq">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/migration.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/migration.mps
index 8c8c17d26a0..172e3d6532e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -44,7 +44,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -54,12 +54,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -107,7 +108,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -121,7 +122,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="3SyAh_" id="Pu8Vy2bHaB">
@@ -170,7 +170,7 @@
                       <node concept="2OqwBi" id="Pu8Vy2bKs6" role="2Oq$k0">
                         <node concept="1PxgMI" id="Pu8Vy2bKRh" role="2Oq$k0">
                           <node concept="37vLTw" id="Pu8Vy2bKpf" role="1m5AlR">
-                            <ref role="3cqZAo" node="Pu8Vy2bKjp" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2p$" resolve="it" />
                           </node>
                           <node concept="chp4Y" id="5RIakkDIUMP" role="3oSUPX">
                             <ref role="cht4Q" to="sh3l:4X7wieqsg8d" resolve="ExtensionClassMethodParameterAnnotation" />
@@ -186,9 +186,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="Pu8Vy2bKjp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2p$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="Pu8Vy2bKjq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2p_" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/structure.mps
index 8665b724c18..e28f301300c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/structure.mps
@@ -38,7 +38,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/typesystem.mps
index 6b767867b77..311c4672d01 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.extensionclass/languageModels/typesystem.mps
@@ -78,7 +78,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -96,6 +96,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -201,7 +202,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -229,7 +230,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -319,16 +319,16 @@
                             </node>
                             <node concept="2OqwBi" id="4X7wieqoU9D" role="3uHU7B">
                               <node concept="37vLTw" id="4X7wieqoTVd" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4X7wieqoTH5" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2py" resolve="it" />
                               </node>
                               <node concept="2bSWHS" id="4X7wieqoUId" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4X7wieqoTH5" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2py" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4X7wieqoTH6" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2pz" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/com.mbeddr.mpsutil.favourites.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/com.mbeddr.mpsutil.favourites.mpl
index 91bd19f0abc..838e7c4051c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/com.mbeddr.mpsutil.favourites.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/com.mbeddr.mpsutil.favourites.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/editor.mps
index c9cc6f9b640..5f8ec69b9c6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/editor.mps
@@ -60,7 +60,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
@@ -151,7 +151,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -167,7 +167,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -184,7 +184,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.mpl
index 9475c00ae0b..d14e84f6000 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps
index 8219e5b1c72..b60c95fefaf 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -71,7 +71,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -172,7 +172,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -193,7 +193,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -268,7 +268,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1140,14 +1140,14 @@
         <property role="TrG5h" value="path" />
         <node concept="17QB3L" id="5lKnBeAuGqV" role="1tU5fm" />
       </node>
+      <node concept="2AHcQZ" id="3uIy_akxeur" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
       <node concept="P$JXv" id="3uIy_akxeuo" role="lGtFl">
         <node concept="TZ5HI" id="3uIy_akxeup" role="3nqlJM">
           <node concept="TZ5HA" id="3uIy_akxeuq" role="3HnX3l" />
         </node>
       </node>
-      <node concept="2AHcQZ" id="3uIy_akxeur" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
     </node>
     <node concept="13i0hz" id="35YirduUNg0" role="13h7CS">
       <property role="TrG5h" value="getCanonicalPath" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/editor.mps
index 7937b1b8137..df6ef292145 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/editor.mps
@@ -5,7 +5,7 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -88,7 +88,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1163613822479" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Abstract_editedNode" flags="nn" index="3GMtW1" />
@@ -160,7 +160,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -173,6 +173,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -196,7 +197,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -208,7 +209,6 @@
         <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -405,7 +405,7 @@
                                   <node concept="liA8E" id="2rWX5ToCfIP" role="2OqNvi">
                                     <ref role="37wK5l" to="z1c3:~PathMacros.getValue(java.lang.String)" resolve="getValue" />
                                     <node concept="37vLTw" id="2rWX5ToCfIQ" role="37wK5m">
-                                      <ref role="3cqZAo" node="2rWX5ToCfIS" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2pB" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -413,9 +413,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2rWX5ToCfIS" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2pB" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2rWX5ToCfIT" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2pC" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -555,7 +555,7 @@
                                   <node concept="liA8E" id="4eXJ6EOu6ex" role="2OqNvi">
                                     <ref role="37wK5l" to="z1c3:~PathMacros.getValue(java.lang.String)" resolve="getValue" />
                                     <node concept="37vLTw" id="4eXJ6EOu6vs" role="37wK5m">
-                                      <ref role="3cqZAo" node="4eXJ6EOu4Q7" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2pD" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -563,9 +563,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4eXJ6EOu4Q7" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2pD" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4eXJ6EOu4Q8" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2pE" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/intentions.mps
index fa9a2dcec37..8ccaed637ed 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/intentions.mps
@@ -83,7 +83,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -142,7 +142,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/structure.mps
index 38a7cb502bd..83c79df3578 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/structure.mps
@@ -38,7 +38,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/typesystem.mps
index 362f2db69b0..1a4f049d71c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/typesystem.mps
@@ -51,7 +51,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -110,7 +110,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/com.mbeddr.mpsutil.framecell.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/com.mbeddr.mpsutil.framecell.mpl
index ef519bf2613..2516e85dd27 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/com.mbeddr.mpsutil.framecell.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/com.mbeddr.mpsutil.framecell.mpl
@@ -37,7 +37,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -97,7 +97,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -107,7 +106,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/generator/template/main@generator.mps
index 0fd2e2209c3..8558b2cb108 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/generator/template/main@generator.mps
@@ -72,7 +72,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -83,7 +83,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -102,7 +102,7 @@
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj">
         <reference id="1200916687663" name="labelDeclaration" index="2sdACS" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -144,7 +144,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageAccessories/com/mbeddr/mpsutil/framecell/runtime.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageAccessories/com/mbeddr/mpsutil/framecell/runtime.mps
index 7cd0577994a..c8a70c1b1bb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageAccessories/com/mbeddr/mpsutil/framecell/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageAccessories/com/mbeddr/mpsutil/framecell/runtime.mps
@@ -34,7 +34,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -107,7 +107,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -129,7 +129,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -139,7 +139,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/editor.mps
index 4449c9bf3ad..fa75ab62f19 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/editor.mps
@@ -40,7 +40,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150113085419" name="jetbrains.mps.lang.editor.structure.StyleAttributeDeclaration" flags="ig" index="3t5Usi">
@@ -57,7 +57,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/structure.mps
index 9f974cfdc1a..67fedc00c5e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.framecell/languageModels/structure.mps
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/generator/template/com/mbeddr/mpsutil/genutil/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/generator/template/com/mbeddr/mpsutil/genutil/generator/template/main@generator.mps
index 398159a389a..b9c4d7832d1 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/generator/template/com/mbeddr/mpsutil/genutil/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/generator/template/com/mbeddr/mpsutil/genutil/generator/template/main@generator.mps
@@ -79,7 +79,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,7 +90,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -180,7 +180,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/genutil.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/genutil.mpl
index ceedac8e440..7640d37349e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/genutil.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/genutil.mpl
@@ -34,7 +34,7 @@
         <language slang="l:b67a6ca0-735e-4903-b238-4b525bddf96a:com.mbeddr.mpsutil.genutil" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -61,7 +61,6 @@
         <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="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" 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" />
@@ -101,7 +100,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
     <dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
@@ -110,7 +108,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -137,7 +135,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/editor.mps
index 7faf9e2afc7..45980aded5a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/editor.mps
@@ -34,7 +34,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/plugin.mps
index 5ad30138741..1757c0303fe 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -48,7 +48,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -59,7 +59,7 @@
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -71,7 +71,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/structure.mps
index 531e46fcba9..cd69e9dd3ba 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/structure.mps
@@ -37,7 +37,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/typesystem.mps
index adcc0146b08..9d127e4bf80 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genutil/languageModels/typesystem.mps
@@ -120,7 +120,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/com.mbeddr.mpsutil.graphstream.example.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/com.mbeddr.mpsutil.graphstream.example.mpl
index 88aa08a7e7f..b6fa9849e2f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/com.mbeddr.mpsutil.graphstream.example.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/com.mbeddr.mpsutil.graphstream.example.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">ab71436a-a7d1-4689-ac02-b5fde2ec681f(com.mbeddr.mpsutil.graphstream.runtime)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/behavior.mps
index 1039164676d..b0a4da212d3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/behavior.mps
@@ -42,7 +42,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -102,7 +102,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,14 +116,14 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/editor.mps
index 8426acc71f8..97ce264193c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/editor.mps
@@ -32,7 +32,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/structure.mps
index c07f31848b0..c8d85b5ed47 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/models/structure.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/com.mbeddr.mpsutil.graphstream.example.sandbox.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/com.mbeddr.mpsutil.graphstream.example.sandbox.msd
index 6e366165cef..442f0130892 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/com.mbeddr.mpsutil.graphstream.example.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/com.mbeddr.mpsutil.graphstream.example.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.graphstream.example.sandbox" uuid="e39344c0-3b28-4b5b-873c-76cb84df9fcb" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.graphstream.example.sandbox" uuid="e39344c0-3b28-4b5b-873c-76cb84df9fcb" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:5787a8ed-1486-4469-94b0-fa3fc6c8538d:com.mbeddr.mpsutil.graphstream" version="0" />
     <language slang="l:72fa8b44-393c-4983-99aa-868cd899b005:com.mbeddr.mpsutil.graphstream.example" version="-1" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/models/com.mbeddr.mpsutil.graphstream.example.sandbox.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/models/com.mbeddr.mpsutil.graphstream.example.sandbox.mps
index 56606e7ee3b..f410c1d0505 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/models/com.mbeddr.mpsutil.graphstream.example.sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/models/com.mbeddr.mpsutil.graphstream.example.sandbox.mps
@@ -10,7 +10,7 @@
       <concept id="5447190170712117255" name="com.mbeddr.mpsutil.graphstream.example.structure.ExampleGraphingElement" flags="ng" index="36OXUu" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/com.mbeddr.mpsutil.graphstream.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/com.mbeddr.mpsutil.graphstream.mpl
index b7424c09505..08437586821 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/com.mbeddr.mpsutil.graphstream.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/com.mbeddr.mpsutil.graphstream.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ab71436a-a7d1-4689-ac02-b5fde2ec681f(com.mbeddr.mpsutil.graphstream.runtime)</dependency>
   </dependencies>
@@ -19,7 +18,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/behavior.mps
index 77a6c76e042..518967f6da7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/behavior.mps
@@ -40,13 +40,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/structure.mps
index b987d224dd7..70a80d588b3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/models/structure.mps
@@ -14,7 +14,7 @@
       <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd
index bb8ba926395..6dc7a6fb34f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.graphstream.runtime" uuid="ab71436a-a7d1-4689-ac02-b5fde2ec681f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.graphstream.runtime" uuid="ab71436a-a7d1-4689-ac02-b5fde2ec681f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -16,17 +16,14 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/gs-algo-1.3.jar" />
+      <library location="${module}/lib/gs-core-1.3.jar" />
+      <library location="${module}/lib/gs-ui-1.3.jar" />
+      <library location="${module}/lib/jgraphx-3.7.4.jar" />
+      <library location="${module}/lib/abego-treelayout-1.0.3.jar" />
+      <library location="${module}/lib/de.itemis.graphing.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/gs-algo-1.3.jar" />
-    <stubModelEntry path="${module}/lib/gs-core-1.3.jar" />
-    <stubModelEntry path="${module}/lib/gs-ui-1.3.jar" />
-    <stubModelEntry path="${module}/lib/jgraphx-3.7.4.jar" />
-    <stubModelEntry path="${module}/lib/abego-treelayout-1.0.3.jar" />
-    <stubModelEntry path="${module}/lib/de.itemis.graphing.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -39,11 +36,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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps
index cca73b12c39..edc8ded2714 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
@@ -63,6 +63,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1227008813498" name="constructionParameter" index="2JrayB" />
@@ -132,7 +133,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -168,7 +169,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -305,7 +306,7 @@
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -336,7 +337,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -370,6 +371,7 @@
       <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -401,7 +403,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -431,7 +433,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -473,7 +475,6 @@
       <concept id="1227022196108" name="jetbrains.mps.baseLanguage.collections.structure.RemoveAtElementOperation" flags="nn" index="2KedMh">
         <child id="1227022274197" name="index" index="2KewY8" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -1537,6 +1538,7 @@
     <property role="TrG5h" value="FitView" />
     <property role="2uzpH1" value="Fit View" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rGUK" role="tncku">
       <node concept="3clFbS" id="4ppn3W9rGUL" role="2VODD2">
         <node concept="3cpWs8" id="4ppn3W9rGUM" role="3cqZAp">
@@ -1612,6 +1614,7 @@
     <property role="TrG5h" value="ZoomIn" />
     <property role="3GE5qa" value="toolbar" />
     <property role="2uzpH1" value="Zoom in" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="18ZQ$P82xbs" role="tncku">
       <node concept="3clFbS" id="18ZQ$P82xbt" role="2VODD2">
         <node concept="3cpWs8" id="18ZQ$P85bR_" role="3cqZAp">
@@ -1658,6 +1661,7 @@
     <property role="TrG5h" value="ZoomOut" />
     <property role="2uzpH1" value="Zoom out" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2sPLpCfQjiA" role="tncku">
       <node concept="3clFbS" id="2sPLpCfQjiB" role="2VODD2">
         <node concept="3cpWs8" id="2sPLpCfQjiC" role="3cqZAp">
@@ -1864,6 +1868,7 @@
   <node concept="sE7Ow" id="bhVSeGf3sb">
     <property role="TrG5h" value="ViewInGraphingToolAction" />
     <property role="2uzpH1" value="Graphing" />
+    <property role="1rBW0U" value="true" />
     <node concept="2JriF1" id="bhVSeGf4__" role="2JrayB">
       <property role="TrG5h" value="viewID" />
       <node concept="3Tm6S6" id="bhVSeGf4_A" role="1B3o_S" />
@@ -2809,6 +2814,7 @@
     <property role="TrG5h" value="HistoryGoBack" />
     <property role="2uzpH1" value="Go Back" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4iv9KfRBKWI" role="tncku">
       <node concept="3clFbS" id="4iv9KfRBKWJ" role="2VODD2">
         <node concept="3cpWs8" id="4iv9KfRBKWK" role="3cqZAp">
@@ -2855,6 +2861,7 @@
     <property role="TrG5h" value="HistoryGoForward" />
     <property role="2uzpH1" value="Go Forward" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4iv9KfRBRSt" role="tncku">
       <node concept="3clFbS" id="4iv9KfRBRSu" role="2VODD2">
         <node concept="3cpWs8" id="4iv9KfRBRSv" role="3cqZAp">
@@ -2901,6 +2908,7 @@
     <property role="TrG5h" value="Refresh" />
     <property role="2uzpH1" value="Refresh" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4iv9KfRC_SF" role="tncku">
       <node concept="3clFbS" id="4iv9KfRC_SG" role="2VODD2">
         <node concept="3cpWs8" id="4iv9KfRC_SH" role="3cqZAp">
@@ -4599,6 +4607,7 @@
     <property role="TrG5h" value="RenderAsSVG" />
     <property role="2uzpH1" value="Render GraphViz SVG" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6x5UxX31b1q" role="tncku">
       <node concept="3clFbS" id="6x5UxX31b1r" role="2VODD2">
         <node concept="3cpWs8" id="6x5UxX31b1s" role="3cqZAp">
@@ -5528,7 +5537,7 @@
                         <node concept="3K4zz7" id="6x5UxX39RDh" role="3clFbG">
                           <node concept="2OqwBi" id="6x5UxX39RDi" role="3K4E3e">
                             <node concept="37vLTw" id="6x5UxX39RDj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6x5UxX39RDt" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Bs" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6x5UxX39RDk" role="2OqNvi">
                               <ref role="37wK5l" to="5svn:~TabularAttachment.getRowIndex()" resolve="getRowIndex" />
@@ -5543,7 +5552,7 @@
                             </node>
                             <node concept="2OqwBi" id="6x5UxX39RDo" role="3uHU7B">
                               <node concept="37vLTw" id="6x5UxX39RDp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6x5UxX39RDt" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Bs" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6x5UxX39RDq" role="2OqNvi">
                                 <ref role="37wK5l" to="5svn:~TabularAttachment.getRowIndex()" resolve="getRowIndex" />
@@ -5557,9 +5566,9 @@
                       <property role="TrG5h" value="max" />
                       <node concept="10Oyi0" id="6x5UxX39RDs" role="1tU5fm" />
                     </node>
-                    <node concept="Rh6nW" id="6x5UxX39RDt" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Bs" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6x5UxX39RDu" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Bt" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="3cmrfG" id="6x5UxX39RDv" role="1MDeny">
@@ -5930,7 +5939,7 @@
                             </node>
                             <node concept="2OqwBi" id="6x5UxX3aq4C" role="3uHU7B">
                               <node concept="37vLTw" id="6x5UxX3aq4D" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6x5UxX3aq4F" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Bu" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6x5UxX3aq4E" role="2OqNvi">
                                 <ref role="37wK5l" to="5svn:~TabularAttachment.getRowIndex()" resolve="getRowIndex" />
@@ -5939,9 +5948,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6x5UxX3aq4F" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Bu" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6x5UxX3aq4G" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Bv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5952,7 +5961,7 @@
                       <node concept="3clFbF" id="6x5UxX3aq4K" role="3cqZAp">
                         <node concept="2OqwBi" id="6x5UxX3aq4L" role="3clFbG">
                           <node concept="37vLTw" id="6x5UxX3aq4M" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6x5UxX3aq4O" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Bw" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6x5UxX3aq4N" role="2OqNvi">
                             <ref role="37wK5l" to="5svn:~TabularAttachment.getColIndex()" resolve="getColIndex" />
@@ -5960,9 +5969,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6x5UxX3aq4O" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Bw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6x5UxX3aq4P" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Bx" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="6x5UxX3aq4Q" role="2S7zOq">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl
index b1b06221c23..a849abd5fa6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl
@@ -35,7 +35,7 @@
         <language slang="l:e776175c-3bf6-498e-ad36-e4c7dfa5fbe9:com.mbeddr.mpsutil.httpsupport" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -111,7 +111,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7f0984ac-9f5d-4001-9257-17f7d10f3fd5(com.mbeddr.mpsutil.httpsupport.rt)</dependency>
     <dependency reexport="false" scope="generate-into">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
@@ -121,7 +120,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps
index 0cdb4a390cf..f9cb04faf31 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps
@@ -73,7 +73,7 @@
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -83,7 +83,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -174,7 +174,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/behavior.mps
index 2486aef72ce..44bde7087d7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/behavior.mps
@@ -67,7 +67,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -87,7 +87,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/constraints.mps
index e7031d82400..a3b00487da0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/constraints.mps
@@ -35,7 +35,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/editor.mps
index d6a8ec4372f..7fa226a099a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/editor.mps
@@ -28,7 +28,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -44,7 +44,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps
index a36091ff541..0d1e2476891 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps
@@ -68,7 +68,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/typesystem.mps
index 8df1277a567..0e600969219 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/typesystem.mps
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl
index f4bcff400dc..023d4c8cbb6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">04e1f940-330e-483b-9a6a-1648b396a81c(com.mbeddr.mpsutil.hyperlink)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -23,7 +22,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps
index 8d5e36ec39d..43c8096a969 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps
@@ -682,11 +682,11 @@
         <ref role="1NtTu8" to="q861:5YjCZTslj6E" resolve="myAbsentChild" />
       </node>
       <node concept="3F0ifn" id="5YjCZTskOAJ" role="3EZMnx" />
+      <node concept="2iRkQZ" id="5YjCZTskMca" role="2iSdaV" />
       <node concept="3F0ifn" id="2wHvNG0katZ" role="3EZMnx">
         <property role="3F0ifm" value="link" />
         <ref role="1ERwB7" node="2wHvNG0kaTF" resolve="Link" />
       </node>
-      <node concept="2iRkQZ" id="5YjCZTskMca" role="2iSdaV" />
     </node>
   </node>
   <node concept="1h_SRR" id="2wHvNG0kaTF">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/structure.mps
index 7ce9b08e0f8..b2dce5c7594 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/structure.mps
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.mpl
index c98054dc0af..650508e4837 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.mpl
@@ -12,7 +12,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -45,7 +44,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps
index 30556fa29f7..f5e849d7783 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps
@@ -6,7 +6,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -80,7 +79,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -100,7 +99,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -115,9 +114,6 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
-        <reference id="1116615189566" name="classifier" index="3VsUkX" />
-      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
@@ -141,11 +137,18 @@
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261755" name="throwable" index="RRSow" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
+      </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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -168,21 +171,6 @@
   </node>
   <node concept="312cEu" id="5A_Zlt6xR7j">
     <property role="TrG5h" value="HyperlinkUtil" />
-    <node concept="Wx3nA" id="5A_Zlt6y3bR" role="jymVt">
-      <property role="TrG5h" value="LOG" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3uibUv" id="5A_Zlt6y2HF" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
-      </node>
-      <node concept="3Tm6S6" id="5A_Zlt6y2Gw" role="1B3o_S" />
-      <node concept="2YIFZM" id="5A_Zlt6y337" role="33vP2m">
-        <ref role="37wK5l" to="q7tw:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
-        <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-        <node concept="3VsKOn" id="5A_Zlt6y34B" role="37wK5m">
-          <ref role="3VsUkX" node="5A_Zlt6xR7j" resolve="HyperlinkUtil" />
-        </node>
-      </node>
-    </node>
     <node concept="Wx3nA" id="5A_Zlt6xXFZ" role="jymVt">
       <property role="TrG5h" value="INSTANCE" />
       <property role="3TUv4t" value="true" />
@@ -363,26 +351,19 @@
               </node>
             </node>
             <node concept="3clFbS" id="3DAECxFHCVO" role="1zc67A">
-              <node concept="3clFbF" id="5A_Zlt6y4Uv" role="3cqZAp">
-                <node concept="2OqwBi" id="5A_Zlt6y4Wv" role="3clFbG">
-                  <node concept="37vLTw" id="5A_Zlt6y4Ut" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5A_Zlt6y3bR" resolve="LOG" />
+              <node concept="RRSsy" id="5EH2I6rnOss" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fh_4/error" />
+                <node concept="3cpWs3" id="5A_Zlt6y6H4" role="RRSoy">
+                  <node concept="37vLTw" id="5A_Zlt6y6Hp" role="3uHU7w">
+                    <ref role="3cqZAo" node="5A_Zlt6y22D" resolve="url" />
                   </node>
-                  <node concept="liA8E" id="5A_Zlt6y5au" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="3cpWs3" id="5A_Zlt6y6H4" role="37wK5m">
-                      <node concept="37vLTw" id="5A_Zlt6y6Hp" role="3uHU7w">
-                        <ref role="3cqZAo" node="5A_Zlt6y22D" resolve="url" />
-                      </node>
-                      <node concept="Xl_RD" id="5A_Zlt6y5gy" role="3uHU7B">
-                        <property role="Xl_RC" value="Failed to open URL: " />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="5A_Zlt6y5Jo" role="37wK5m">
-                      <ref role="3cqZAo" node="3DAECxFHCVM" resolve="ex" />
-                    </node>
+                  <node concept="Xl_RD" id="5A_Zlt6y5gy" role="3uHU7B">
+                    <property role="Xl_RC" value="Failed to open URL: " />
                   </node>
                 </node>
+                <node concept="37vLTw" id="5EH2I6rnOUj" role="RRSow">
+                  <ref role="3cqZAo" node="3DAECxFHCVM" resolve="ex" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/editor.mps
index 914fdf59e08..af5279600c0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/editor.mps
@@ -43,13 +43,13 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -58,7 +58,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps
index cd96f155574..6e35ac68000 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="04e1f940-330e-483b-9a6a-1648b396a81c/r:8ee8d931-50ee-4faf-9bc7-42bf68f76be9(com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/structure.mps
index 0f54f1d05e2..ef9b747086d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/structure.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/com.mbeddr.mpsutil.iconchar.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/com.mbeddr.mpsutil.iconchar.mpl
index 9b7b3332f65..250d1acc1bc 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/com.mbeddr.mpsutil.iconchar.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/com.mbeddr.mpsutil.iconchar.mpl
@@ -34,7 +34,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -103,7 +103,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
@@ -116,7 +115,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -142,7 +141,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/generator/template/main@generator.mps
index 58e3eabe448..7f0e2795720 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/generator/template/main@generator.mps
@@ -58,6 +58,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -80,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -89,7 +90,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="bUwia" id="7GaZbxRUj5O">
@@ -125,15 +125,15 @@
                           <property role="Xl_RC" value="IconChar is not longer supported please run the migrations for this model to remove it. It will get replaced with an MPS native concept." />
                         </node>
                         <node concept="37vLTw" id="72HfR5QagqP" role="2k6f33">
-                          <ref role="3cqZAo" node="7GaZbxS0V_Q" resolve="iconChar" />
+                          <ref role="3cqZAo" node="2SR9xrsN2pL" resolve="iconChar" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7GaZbxS0V_Q" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2pL" role="1bW2Oz">
                   <property role="TrG5h" value="iconChar" />
-                  <node concept="2jxLKc" id="7GaZbxS0V_R" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2pM" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/behavior.mps
index b5476dc238c..749e25efd5c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/behavior.mps
@@ -150,7 +150,7 @@
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -175,7 +175,7 @@
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4">
         <child id="9056323058805176516" name="loopLabelReference" index="2mV7Oi" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -235,7 +235,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/constraints.mps
index a048f4fe1bc..ac3852fdb22 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/constraints.mps
@@ -33,7 +33,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -57,7 +57,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="3f41734b-72c3-42c8-b22c-bacd5a878e17" name="com.mbeddr.mpsutil.propertydefault">
-      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ng" index="3_egWj">
+      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ngI" index="3_egWj">
         <child id="1550432487216060794" name="defaultValue" index="3_eitr" />
       </concept>
       <concept id="1550432487216062719" name="com.mbeddr.mpsutil.propertydefault.structure.NodePropertyConstraintDefault" flags="ng" index="3_ehVu" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/editor.mps
index 3ec7e481e62..745e1ce7cfe 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/editor.mps
@@ -31,7 +31,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/migration.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/migration.mps
index f85dbeccda3..43749969d7b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -70,7 +70,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -85,7 +85,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -169,7 +169,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/structure.mps
index 1f8cca15127..1994e404f60 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/structure.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/typesystem.mps
index 5e77d748919..4cd7aa87610 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.iconchar/languageModels/typesystem.mps
@@ -38,7 +38,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/com.mbeddr.mpsutil.incrementalcomputation.example.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/com.mbeddr.mpsutil.incrementalcomputation.example.mpl
index 18ed68a6716..26dbaad398c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/com.mbeddr.mpsutil.incrementalcomputation.example.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/com.mbeddr.mpsutil.incrementalcomputation.example.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">8ecfd3b5-385b-43fc-ace0-9babcff50bdb(com.mbeddr.mpsutil.incrementalcomputation.example)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.behavior.mps
index f9365f4a1fe..95ce77e49b7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.behavior.mps
@@ -111,7 +111,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,7 +124,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -132,6 +132,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -196,7 +197,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -215,7 +216,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -253,7 +253,7 @@
                         <node concept="3clFbF" id="RObVTFn8IE" role="3cqZAp">
                           <node concept="2OqwBi" id="RObVTFn8TM" role="3clFbG">
                             <node concept="37vLTw" id="RObVTFn8ID" role="2Oq$k0">
-                              <ref role="3cqZAo" node="RObVTFn8BD" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2pN" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="RObVTFn97_" role="2OqNvi">
                               <ref role="3Tt5mk" to="ej70:2S2eLhiN8eq" resolve="graphNode" />
@@ -261,9 +261,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="RObVTFn8BD" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2pN" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="RObVTFn8BE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2pO" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -275,14 +275,14 @@
                         <node concept="3y3z36" id="61NZ8UZmqUp" role="3clFbG">
                           <node concept="10Nm6u" id="61NZ8UZmrao" role="3uHU7w" />
                           <node concept="37vLTw" id="61NZ8UZmq_z" role="3uHU7B">
-                            <ref role="3cqZAo" node="61NZ8UZmqkv" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2pP" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="61NZ8UZmqkv" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2pP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="61NZ8UZmqkw" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2pQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -346,7 +346,7 @@
                               <node concept="2OqwBi" id="3mJtqpyQ5XI" role="2Oq$k0">
                                 <node concept="2OqwBi" id="3mJtqpyPS6N" role="2Oq$k0">
                                   <node concept="37vLTw" id="3mJtqpyPROI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3mJtqpyPRB6" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2pV" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="3mJtqpyPSuQ" role="2OqNvi">
                                     <ref role="3TtcxE" to="ej70:2S2eLhiN8e9" resolve="linkedTo" />
@@ -358,7 +358,7 @@
                                       <node concept="3clFbF" id="3mJtqpyQ8sY" role="3cqZAp">
                                         <node concept="2OqwBi" id="3mJtqpyQ8Km" role="3clFbG">
                                           <node concept="37vLTw" id="3mJtqpyQ8sX" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3mJtqpyQ800" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2pR" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="3mJtqpyQ9iW" role="2OqNvi">
                                             <ref role="3Tt5mk" to="ej70:2S2eLhiN8eq" resolve="graphNode" />
@@ -366,9 +366,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3mJtqpyQ800" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2pR" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="3mJtqpyQ801" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2pS" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -380,14 +380,14 @@
                                       <node concept="3y3z36" id="50uWDT$CFef" role="3clFbG">
                                         <node concept="10Nm6u" id="50uWDT$CFvU" role="3uHU7w" />
                                         <node concept="37vLTw" id="50uWDT$CDnX" role="3uHU7B">
-                                          <ref role="3cqZAo" node="50uWDT$CCf_" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2pT" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="50uWDT$CCf_" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2pT" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="50uWDT$CCfA" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2pU" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -398,9 +398,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3mJtqpyPRB6" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2pV" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3mJtqpyPRB7" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2pW" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -468,7 +468,7 @@
                             <node concept="2OqwBi" id="RObVTFsJEA" role="3clFbG">
                               <node concept="2OqwBi" id="RObVTFsJEB" role="2Oq$k0">
                                 <node concept="37vLTw" id="RObVTFsJEC" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="RObVTFsJEG" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2pX" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="RObVTFsJED" role="2OqNvi">
                                   <ref role="3Tt5mk" to="ej70:2S2eLhiN8eq" resolve="graphNode" />
@@ -480,9 +480,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="RObVTFsJEG" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2pX" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="RObVTFsJEH" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2pY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -497,7 +497,7 @@
                             </node>
                             <node concept="2OqwBi" id="RObVTFsJEQ" role="3uHU7w">
                               <node concept="37vLTw" id="50uWDT$NHy6" role="2Oq$k0">
-                                <ref role="3cqZAo" node="RObVTFsJEW" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2pZ" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="RObVTFsJES" role="2OqNvi">
                                 <ref role="3TsBF5" to="ej70:RObVTFo2_s" resolve="value" />
@@ -510,9 +510,9 @@
                         <property role="TrG5h" value="s" />
                         <node concept="10Oyi0" id="RObVTFsJEV" role="1tU5fm" />
                       </node>
-                      <node concept="Rh6nW" id="RObVTFsJEW" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2pZ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="RObVTFsJEX" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2q0" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="7CsrqpZnDSP" role="1MDeny">
@@ -602,7 +602,7 @@
                                   <node concept="2OqwBi" id="3mJtqpyQc3m" role="2Oq$k0">
                                     <node concept="2OqwBi" id="3mJtqpyQc3n" role="2Oq$k0">
                                       <node concept="37vLTw" id="3mJtqpyQc3o" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3mJtqpyQc3_" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2q3" resolve="it" />
                                       </node>
                                       <node concept="3Tsc0h" id="3mJtqpyQc3p" role="2OqNvi">
                                         <ref role="3TtcxE" to="ej70:2S2eLhiN8e9" resolve="linkedTo" />
@@ -614,7 +614,7 @@
                                           <node concept="3clFbF" id="3mJtqpyQc3t" role="3cqZAp">
                                             <node concept="2OqwBi" id="3mJtqpyQc3u" role="3clFbG">
                                               <node concept="37vLTw" id="3mJtqpyQc3v" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3mJtqpyQc3x" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2q1" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="3mJtqpyQc3w" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="ej70:2S2eLhiN8eq" resolve="graphNode" />
@@ -622,9 +622,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="3mJtqpyQc3x" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2SR9xrsN2q1" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="3mJtqpyQc3y" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2SR9xrsN2q2" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -635,9 +635,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3mJtqpyQc3_" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2q3" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3mJtqpyQc3A" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2q4" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -648,7 +648,7 @@
                             <node concept="3clFbF" id="3mJtqpyQpJG" role="3cqZAp">
                               <node concept="2OqwBi" id="3mJtqpyQqir" role="3clFbG">
                                 <node concept="37vLTw" id="3mJtqpyQpJF" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3mJtqpyQpeb" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2q5" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="3mJtqpyQqW8" role="2OqNvi">
                                   <ref role="37wK5l" node="50uWDT$MxIP" resolve="getValueB" />
@@ -656,9 +656,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3mJtqpyQpeb" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2q5" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3mJtqpyQpec" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2q6" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -673,7 +673,7 @@
                               </node>
                               <node concept="2OqwBi" id="3mJtqpyQcGL" role="3uHU7w">
                                 <node concept="37vLTw" id="50uWDT$NMxD" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3mJtqpyQcGT" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2q7" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="3mJtqpyQcGQ" role="2OqNvi">
                                   <ref role="3TsBF5" to="ej70:3mJtqpyOBRF" resolve="value" />
@@ -686,9 +686,9 @@
                           <property role="TrG5h" value="s" />
                           <node concept="10Oyi0" id="3mJtqpyQcGS" role="1tU5fm" />
                         </node>
-                        <node concept="Rh6nW" id="3mJtqpyQcGT" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2q7" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3mJtqpyQcGU" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2q8" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="3mJtqpyQcGV" role="1MDeny">
@@ -976,7 +976,7 @@
                               <node concept="3clFbF" id="ymtTuKAv2r" role="3cqZAp">
                                 <node concept="2OqwBi" id="ymtTuKAv2s" role="3clFbG">
                                   <node concept="37vLTw" id="ymtTuKAv2t" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="ymtTuKAv2v" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2q9" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="ymtTuKAv2u" role="2OqNvi">
                                     <ref role="3Tt5mk" to="ej70:2S2eLhiN8eq" resolve="graphNode" />
@@ -984,9 +984,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="ymtTuKAv2v" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2q9" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="ymtTuKAv2w" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2qa" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -998,14 +998,14 @@
                               <node concept="3y3z36" id="50uWDT$E76t" role="3clFbG">
                                 <node concept="10Nm6u" id="50uWDT$E7oe" role="3uHU7w" />
                                 <node concept="37vLTw" id="50uWDT$E6Kp" role="3uHU7B">
-                                  <ref role="3cqZAo" node="50uWDT$E6tz" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2qb" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="50uWDT$E6tz" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2qb" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="50uWDT$E6t$" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2qc" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.editor.mps
index 978096364e4..fb61fb6f023 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.editor.mps
@@ -54,7 +54,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -85,7 +85,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.structure.mps
index e8e56448ed0..f72f7f908c8 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.structure.mps
@@ -38,7 +38,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.typesystem.mps
index f43dd9a8977..34d5415d247 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/models/com.mbeddr.mpsutil.incrementalcomputation.example.typesystem.mps
@@ -45,7 +45,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -58,6 +58,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -88,7 +89,7 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -105,7 +106,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="18kY7G" id="6QoXIYUbgcu">
@@ -202,7 +202,7 @@
                           <property role="3cmrfH" value="1" />
                         </node>
                         <node concept="37vLTw" id="5uCOCQhZOH4" role="1LFl5Q">
-                          <ref role="3cqZAo" node="6QoXIYUbK1K" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2qd" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -213,7 +213,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="6QoXIYUbNOL" role="1LFl5Q">
-                            <ref role="3cqZAo" node="6QoXIYUbK1K" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qd" resolve="it" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="6QoXIYUbKho" role="3uHU7B">
@@ -230,9 +230,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6QoXIYUbK1K" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2qd" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="6QoXIYUbK1L" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2qe" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/com.mbeddr.mpsutil.incrementalcomputation.example.sandbox.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/com.mbeddr.mpsutil.incrementalcomputation.example.sandbox.msd
index e3615ec95e8..7fa3744e54a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/com.mbeddr.mpsutil.incrementalcomputation.example.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/com.mbeddr.mpsutil.incrementalcomputation.example.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.incrementalcomputation.example.sandbox" uuid="1079b29e-35b0-4c26-84af-69342647bd2f" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.incrementalcomputation.example.sandbox" uuid="1079b29e-35b0-4c26-84af-69342647bd2f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:fca4b687-11d4-461f-9cd4-f00968145931:com.mbeddr.mpsutil.incrementalcomputation" version="0" />
     <language slang="l:8ecfd3b5-385b-43fc-ace0-9babcff50bdb:com.mbeddr.mpsutil.incrementalcomputation.example" version="-1" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/models/de.itemis.mps.lazypropagation.example.sandbox.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/models/de.itemis.mps.lazypropagation.example.sandbox.mps
index d2ce97cc766..07320e1a850 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/models/de.itemis.mps.lazypropagation.example.sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation.example/sandbox/models/de.itemis.mps.lazypropagation.example.sandbox.mps
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/com.mbeddr.mpsutil.incrementalcomputation.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/com.mbeddr.mpsutil.incrementalcomputation.mpl
index 97811481e87..064440cef02 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/com.mbeddr.mpsutil.incrementalcomputation.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/com.mbeddr.mpsutil.incrementalcomputation.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">0fdbe445-2f40-47cb-beff-b44f4f5ffde0(com.mbeddr.mpsutil.incrementalcomputation.runtime)</dependency>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.behavior.mps
index 4f0b520eaa9..851ae51f062 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.behavior.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -97,7 +97,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -109,7 +109,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -139,7 +139,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.structure.mps
index 561cf37fcb8..c40a49cb777 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.structure.mps
@@ -14,7 +14,7 @@
       <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.typesystem.mps
index c33d1e448a7..73f1cd72f54 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/models/com.mbeddr.mpsutil.incrementalcomputation.typesystem.mps
@@ -45,7 +45,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -58,6 +58,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -88,7 +89,7 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -105,7 +106,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="18kY7G" id="5YITc37Q9oL">
@@ -201,7 +201,7 @@
                           <property role="3cmrfH" value="1" />
                         </node>
                         <node concept="37vLTw" id="5uCOCQhZOH4" role="1LFl5Q">
-                          <ref role="3cqZAo" node="6QoXIYUbK1K" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2qg" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -212,7 +212,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="6QoXIYUbNOL" role="1LFl5Q">
-                            <ref role="3cqZAo" node="6QoXIYUbK1K" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qg" resolve="it" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="6QoXIYUbKho" role="3uHU7B">
@@ -229,9 +229,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6QoXIYUbK1K" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2qg" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="6QoXIYUbK1L" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2qh" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/com.mbeddr.mpsutil.incrementalcomputation.runtime.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/com.mbeddr.mpsutil.incrementalcomputation.runtime.msd
index ab1203eef6a..7713a0ff961 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/com.mbeddr.mpsutil.incrementalcomputation.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/com.mbeddr.mpsutil.incrementalcomputation.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.incrementalcomputation.runtime" uuid="0fdbe445-2f40-47cb-beff-b44f4f5ffde0" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.incrementalcomputation.runtime" uuid="0fdbe445-2f40-47cb-beff-b44f4f5ffde0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">fca4b687-11d4-461f-9cd4-f00968145931(com.mbeddr.mpsutil.incrementalcomputation)</dependency>
@@ -27,12 +26,12 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.mps
index 00ae6ad8ad7..ca453dbd52f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -49,7 +49,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -173,7 +173,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -204,7 +204,7 @@
         <child id="1202077744034" name="visibility" index="3xqFEP" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -220,6 +220,7 @@
       <concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -275,7 +276,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -325,7 +326,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
       <concept id="1240217271293" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashSetCreator" flags="nn" index="32HrFt" />
@@ -469,7 +469,7 @@
                       <node concept="2OqwBi" id="5YITc37RnZi" role="3clFbG">
                         <node concept="2OqwBi" id="5YITc37RnZj" role="2Oq$k0">
                           <node concept="37vLTw" id="5YITc37RnZk" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5YITc37RnZn" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2By" resolve="it" />
                           </node>
                           <node concept="3AV6Ez" id="5YITc37RnZl" role="2OqNvi" />
                         </node>
@@ -479,9 +479,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5YITc37RnZn" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2By" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5YITc37RnZo" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Bz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -493,14 +493,14 @@
                     <node concept="1Ls8ON" id="5uCOCQhZrTt" role="3clFbG">
                       <node concept="2OqwBi" id="5uCOCQhZtsI" role="1Lso8e">
                         <node concept="37vLTw" id="5uCOCQhZsKu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5YITc37RnZw" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2B$" resolve="it" />
                         </node>
                         <node concept="3AY5_j" id="5uCOCQhZtW_" role="2OqNvi" />
                       </node>
                       <node concept="2OqwBi" id="5uCOCQhZwNt" role="1Lso8e">
                         <node concept="2OqwBi" id="5uCOCQhZvEs" role="2Oq$k0">
                           <node concept="37vLTw" id="5uCOCQhZuWa" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5YITc37RnZw" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2B$" resolve="it" />
                           </node>
                           <node concept="3AV6Ez" id="5uCOCQhZw5f" role="2OqNvi" />
                         </node>
@@ -511,9 +511,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5YITc37RnZw" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2B$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5YITc37RnZx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2B_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1161,7 +1161,7 @@
                     <node concept="3clFbF" id="2NSCtASsaPu" role="3cqZAp">
                       <node concept="2OqwBi" id="2NSCtASsbhH" role="3clFbG">
                         <node concept="37vLTw" id="2NSCtASsaPt" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2NSCtASsakr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2BA" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2NSCtASsbPI" role="2OqNvi">
                           <ref role="37wK5l" to="ao0u:2S2eLhiM$ey" resolve="getValueHolderInfo" />
@@ -1169,9 +1169,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2NSCtASsakr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2BA" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2NSCtASsaks" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2BB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1194,7 +1194,7 @@
                   <node concept="3clFbF" id="2wC5sgtDjZT" role="3cqZAp">
                     <node concept="2OqwBi" id="2NSCtASsPAV" role="3clFbG">
                       <node concept="37vLTw" id="2wC5sgtDjZS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2wC5sgtDjPx" resolve="source" />
+                        <ref role="3cqZAo" node="2SR9xrsN2BC" resolve="source" />
                       </node>
                       <node concept="liA8E" id="2NSCtASsPNP" role="2OqNvi">
                         <ref role="37wK5l" node="RObVTFoPhX" resolve="addPropagationTarget" />
@@ -1208,9 +1208,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2wC5sgtDjPx" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2BC" role="1bW2Oz">
                   <property role="TrG5h" value="source" />
-                  <node concept="2jxLKc" id="2wC5sgtDjPy" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2BD" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1432,7 +1432,7 @@
                         <node concept="3clFbF" id="2NSCtAStm01" role="3cqZAp">
                           <node concept="2OqwBi" id="2NSCtAStmtY" role="3clFbG">
                             <node concept="37vLTw" id="2NSCtAStm00" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2NSCtAStltB" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2BE" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2NSCtAStn9u" role="2OqNvi">
                               <ref role="37wK5l" to="ao0u:2S2eLhiM$ey" resolve="getValueHolderInfo" />
@@ -1440,9 +1440,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2NSCtAStltB" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2BE" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2NSCtAStltC" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2BF" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1471,16 +1471,16 @@
                               </node>
                               <node concept="3JPx81" id="2wC5sgtDakA" role="2OqNvi">
                                 <node concept="37vLTw" id="2wC5sgtDaMA" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2wC5sgtCggW" resolve="newSource" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2BG" resolve="newSource" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2wC5sgtCggW" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2BG" role="1bW2Oz">
                         <property role="TrG5h" value="newSource" />
-                        <node concept="2jxLKc" id="2wC5sgtCggX" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2BH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1491,7 +1491,7 @@
                       <node concept="3clFbF" id="2wC5sgtDddv" role="3cqZAp">
                         <node concept="2OqwBi" id="2NSCtASttBb" role="3clFbG">
                           <node concept="37vLTw" id="2wC5sgtDddu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2wC5sgtDcRX" resolve="newSource" />
+                            <ref role="3cqZAo" node="2SR9xrsN2BI" resolve="newSource" />
                           </node>
                           <node concept="liA8E" id="2NSCtAStu2O" role="2OqNvi">
                             <ref role="37wK5l" node="RObVTFoPhX" resolve="addPropagationTarget" />
@@ -1505,9 +1505,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2wC5sgtDcRX" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2BI" role="1bW2Oz">
                       <property role="TrG5h" value="newSource" />
-                      <node concept="2jxLKc" id="2wC5sgtDcRY" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2BJ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1530,16 +1530,16 @@
                               </node>
                               <node concept="3JPx81" id="2wC5sgtDKLi" role="2OqNvi">
                                 <node concept="37vLTw" id="2wC5sgtDL5d" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2wC5sgtDGQC" resolve="oldSource" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2BK" resolve="oldSource" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2wC5sgtDGQC" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2BK" role="1bW2Oz">
                         <property role="TrG5h" value="oldSource" />
-                        <node concept="2jxLKc" id="2wC5sgtDGQD" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2BL" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1550,7 +1550,7 @@
                       <node concept="3clFbF" id="2wC5sgtDODz" role="3cqZAp">
                         <node concept="2OqwBi" id="2NSCtAStvqt" role="3clFbG">
                           <node concept="37vLTw" id="2wC5sgtDODy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2wC5sgtDMUr" resolve="oldSource" />
+                            <ref role="3cqZAo" node="2SR9xrsN2BM" resolve="oldSource" />
                           </node>
                           <node concept="liA8E" id="2NSCtAStvQK" role="2OqNvi">
                             <ref role="37wK5l" node="RObVTFoQPx" resolve="removePropagationTarget" />
@@ -1564,9 +1564,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2wC5sgtDMUr" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2BM" role="1bW2Oz">
                       <property role="TrG5h" value="oldSource" />
-                      <node concept="2jxLKc" id="2wC5sgtDMUs" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2BN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1615,7 +1615,7 @@
                   <node concept="3clFbF" id="61NZ8UZnU$k" role="3cqZAp">
                     <node concept="2OqwBi" id="61NZ8UZnU$l" role="3clFbG">
                       <node concept="37vLTw" id="61NZ8UZnU$m" role="2Oq$k0">
-                        <ref role="3cqZAo" node="61NZ8UZnU5s" resolve="target" />
+                        <ref role="3cqZAo" node="2SR9xrsN2BO" resolve="target" />
                       </node>
                       <node concept="liA8E" id="61NZ8UZnU$n" role="2OqNvi">
                         <ref role="37wK5l" node="RObVTFmZbg" resolve="invalidate" />
@@ -1632,9 +1632,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="61NZ8UZnU5s" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2BO" role="1bW2Oz">
                   <property role="TrG5h" value="target" />
-                  <node concept="2jxLKc" id="61NZ8UZnU5t" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2BP" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1932,14 +1932,14 @@
                         <ref role="3cqZAo" node="5YITc37MTr4" resolve="participantStack" />
                       </node>
                       <node concept="37vLTw" id="5YITc37PaLo" role="37wK5m">
-                        <ref role="3cqZAo" node="5YITc37OTsL" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2BQ" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5YITc37OTsL" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2BQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5YITc37OTsM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2BR" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2111,7 +2111,7 @@
                         <node concept="2OqwBi" id="797ZNR2jWWe" role="3clFbG">
                           <node concept="2OqwBi" id="797ZNR2jVY8" role="2Oq$k0">
                             <node concept="37vLTw" id="797ZNR2jVNl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="797ZNR2jQt1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2BS" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="797ZNR2jWI_" role="2OqNvi">
                               <ref role="37wK5l" to="ao0u:2S2eLhiM$ey" resolve="getValueHolderInfo" />
@@ -2137,9 +2137,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="797ZNR2jQt1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2BS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="797ZNR2jQt2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2BT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2173,7 +2173,7 @@
                   <node concept="3clFbF" id="1kbsEhJFrG6" role="3cqZAp">
                     <node concept="2OqwBi" id="1kbsEhJFrXv" role="3clFbG">
                       <node concept="37vLTw" id="1kbsEhJFrG5" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1kbsEhJFrAG" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2BU" resolve="it" />
                       </node>
                       <node concept="liA8E" id="1kbsEhJFskH" role="2OqNvi">
                         <ref role="37wK5l" node="RObVTFnwug" resolve="getValueHolder" />
@@ -2181,9 +2181,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1kbsEhJFrAG" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2BU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1kbsEhJFrAH" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2BV" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2243,7 +2243,7 @@
                                 <node concept="2OqwBi" id="4bmM0avMFeJ" role="3uHU7B">
                                   <node concept="2OqwBi" id="4bmM0avMFeK" role="2Oq$k0">
                                     <node concept="37vLTw" id="4bmM0avMFeL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4bmM0avMFeO" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2BW" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="4bmM0avMFeM" role="2OqNvi">
                                       <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
@@ -2259,9 +2259,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4bmM0avMFeO" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2BW" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4bmM0avMFeP" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2BX" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2272,7 +2272,7 @@
                           <node concept="3clFbF" id="4bmM0avMFeT" role="3cqZAp">
                             <node concept="2OqwBi" id="4bmM0avMFeU" role="3clFbG">
                               <node concept="37vLTw" id="4bmM0avMFeV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4bmM0avMFeX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2BY" resolve="it" />
                               </node>
                               <node concept="liA8E" id="4bmM0avMFeW" role="2OqNvi">
                                 <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
@@ -2280,9 +2280,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4bmM0avMFeX" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2BY" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4bmM0avMFeY" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2BZ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3417,7 +3417,7 @@
                   <node concept="3clFbF" id="KudFejVdNq" role="3cqZAp">
                     <node concept="2OqwBi" id="KudFejVdXv" role="3clFbG">
                       <node concept="37vLTw" id="KudFejVdNp" role="2Oq$k0">
-                        <ref role="3cqZAo" node="KudFejVdCH" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2C0" resolve="it" />
                       </node>
                       <node concept="liA8E" id="KudFejVe9V" role="2OqNvi">
                         <ref role="37wK5l" to="mhbf:~SModel.removeChangeListener(org.jetbrains.mps.openapi.model.SNodeChangeListener)" resolve="removeChangeListener" />
@@ -3426,9 +3426,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="KudFejVdCH" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2C0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="KudFejVdCI" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2C1" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3454,7 +3454,7 @@
                     <node concept="2OqwBi" id="50uWDT$GlCL" role="3clFbG">
                       <node concept="2OqwBi" id="KudFejVUMX" role="2Oq$k0">
                         <node concept="37vLTw" id="KudFejUovS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KudFejUovU" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2C4" resolve="it" />
                         </node>
                         <node concept="3AV6Ez" id="KudFejVV1q" role="2OqNvi" />
                       </node>
@@ -3464,7 +3464,7 @@
                             <node concept="3clFbF" id="50uWDT$GmWx" role="3cqZAp">
                               <node concept="2OqwBi" id="50uWDT$Gnc5" role="3clFbG">
                                 <node concept="37vLTw" id="50uWDT$GmWw" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="50uWDT$GmK0" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2C2" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="50uWDT$GnsD" role="2OqNvi">
                                   <ref role="37wK5l" node="7CsrqpZonfx" resolve="dispose" />
@@ -3472,18 +3472,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="50uWDT$GmK0" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2C2" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="50uWDT$GmK1" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2C3" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="KudFejUovU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2C4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="KudFejUovV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2C5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3529,15 +3529,15 @@
                       <node concept="3clFbF" id="2_5DHynKjx9" role="3cqZAp">
                         <node concept="2OqwBi" id="2_5DHynKjxa" role="3clFbG">
                           <node concept="37vLTw" id="2_5DHynKjxb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2_5DHynKjxd" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2C6" resolve="it" />
                           </node>
                           <node concept="3AV6Ez" id="2_5DHynKmBr" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2_5DHynKjxd" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2C6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2_5DHynKjxe" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2C7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3549,7 +3549,7 @@
                       <node concept="2OqwBi" id="2_5DHynKCxh" role="3clFbG">
                         <node concept="2OqwBi" id="2_5DHynKt4g" role="2Oq$k0">
                           <node concept="37vLTw" id="2_5DHynKsNc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2_5DHynKsBz" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2C8" resolve="it" />
                           </node>
                           <node concept="liA8E" id="2_5DHynKBYe" role="2OqNvi">
                             <ref role="37wK5l" node="2_5DHynKzeT" resolve="getValueSelector" />
@@ -3564,9 +3564,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2_5DHynKsBz" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2C8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2_5DHynKsB$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2C9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3577,7 +3577,7 @@
                   <node concept="3clFbF" id="2_5DHynKHoM" role="3cqZAp">
                     <node concept="2OqwBi" id="2_5DHynKHDa" role="3clFbG">
                       <node concept="37vLTw" id="2_5DHynKHoL" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2_5DHynKH2T" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Ca" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2_5DHynKI2D" role="2OqNvi">
                         <ref role="37wK5l" node="RObVTFmWkR" resolve="invalidate" />
@@ -3596,9 +3596,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2_5DHynKH2T" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ca" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2_5DHynKH2U" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Cb" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3944,7 +3944,7 @@
                       <node concept="3clFbF" id="50uWDT$GzjN" role="3cqZAp">
                         <node concept="2OqwBi" id="50uWDT$Gzso" role="3clFbG">
                           <node concept="37vLTw" id="50uWDT$GzjM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="50uWDT$GuOL" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Cc" resolve="it" />
                           </node>
                           <node concept="liA8E" id="50uWDT$GzNH" role="2OqNvi">
                             <ref role="37wK5l" node="KudFejWkex" resolve="contentChanged" />
@@ -3955,9 +3955,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="50uWDT$GuOL" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Cc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="50uWDT$GuOM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Cd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.plugin.mps
index 43ff8988448..cbc72360f57 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.incrementalcomputation/runtime/models/com.mbeddr.mpsutil.incrementalcomputation.runtime.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:ea43355c-7b67-44a5-b887-109a2cac944c(com.mbeddr.mpsutil.incrementalcomputation.runtime.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -35,7 +35,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -85,7 +85,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,7 +97,7 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -113,12 +113,12 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/com.mbeddr.mpsutil.interpreter.test.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/com.mbeddr.mpsutil.interpreter.test.mpl
index 98afceaf618..b94c817167f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/com.mbeddr.mpsutil.interpreter.test.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/com.mbeddr.mpsutil.interpreter.test.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/behavior.mps
index 35639c3bf88..d0b49fd3710 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/behavior.mps
@@ -97,7 +97,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,7 +113,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -129,7 +129,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/editor.mps
index cb2cd9878e2..ac7b4d17cf5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/editor.mps
@@ -40,7 +40,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/structure.mps
index 34676acf302..3e11116a635 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/structure.mps
@@ -30,7 +30,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/typesystem.mps
index 715dd611ec8..8bffcac5b69 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter.test/languageModels/typesystem.mps
@@ -36,7 +36,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -71,7 +71,7 @@
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl
index 475e704a3f8..913fcf927e3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl
@@ -41,7 +41,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -128,7 +128,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -152,7 +151,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -176,7 +175,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
index 392b825db71..96b8b196b31 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
@@ -326,6 +326,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
       </concept>
@@ -476,7 +477,6 @@
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -715,7 +715,7 @@
                                     <node concept="liA8E" id="7F2vPZ3I7EC" role="2OqNvi">
                                       <ref role="37wK5l" to="2ahs:2X4$XGmegKw" resolve="evaluate" />
                                       <node concept="37vLTw" id="7F2vPZ3I7EE" role="37wK5m">
-                                        <ref role="3cqZAo" node="7F2vPZ3I7EL" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2r6" resolve="it" />
                                       </node>
                                       <node concept="37vLTw" id="7F2vPZ3I7EG" role="37wK5m">
                                         <ref role="3cqZAo" node="59qdqedScin" resolve="context" />
@@ -768,9 +768,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7F2vPZ3I7EL" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2r6" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7F2vPZ3I7EM" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2r7" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1769,7 +1769,7 @@
                               <node concept="liA8E" id="7oujAIfFyb3" role="2OqNvi">
                                 <ref role="37wK5l" to="2ahs:7oujAIft2qt" resolve="isEvaluable" />
                                 <node concept="37vLTw" id="7oujAIfFyb4" role="37wK5m">
-                                  <ref role="3cqZAo" node="7oujAIfFybh" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2r8" resolve="it" />
                                 </node>
                                 <node concept="37vLTw" id="7oujAIfFyb5" role="37wK5m">
                                   <ref role="3cqZAo" node="7oujAIfFnh_" resolve="context" />
@@ -1807,9 +1807,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7oujAIfFybh" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2r8" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7oujAIfFybi" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2r9" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3449,7 +3449,7 @@
                             <node concept="3fqX7Q" id="2ALJBcqX78z" role="3clFbG">
                               <node concept="2OqwBi" id="2ALJBcqX78$" role="3fr31v">
                                 <node concept="37vLTw" id="2ALJBcqX78_" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2ALJBcqX6re" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2ra" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="2ALJBcqX78A" role="2OqNvi">
                                   <node concept="chp4Y" id="2ALJBcqX78B" role="cj9EA">
@@ -3460,9 +3460,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ALJBcqX6re" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2ra" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ALJBcqX6rf" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2rb" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3613,7 +3613,7 @@
                         <node concept="2OqwBi" id="1L96m4u4SLc" role="2Oq$k0">
                           <node concept="2yIwOk" id="1L96m4u4SLd" role="2OqNvi" />
                           <node concept="37vLTw" id="1L96m4u4SWY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2bBLuwRpKQ6" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2rc" resolve="it" />
                           </node>
                         </node>
                         <node concept="3O6GUB" id="1L96m4u4SLf" role="2OqNvi">
@@ -3624,9 +3624,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2bBLuwRpKQ6" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2rc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2bBLuwRpKQ7" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2rd" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3637,15 +3637,15 @@
                   <node concept="3clFbF" id="2bBLuwRpOSt" role="3cqZAp">
                     <node concept="2OqwBi" id="2bBLuwRpP06" role="3clFbG">
                       <node concept="37vLTw" id="2bBLuwRpOSs" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2bBLuwRpOKN" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2re" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="2bBLuwRpQk5" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2bBLuwRpOKN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2re" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2bBLuwRpOKO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2rf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5625,7 +5625,7 @@
                             <node concept="3fqX7Q" id="7oujAIfrzRz" role="3clFbG">
                               <node concept="2OqwBi" id="7oujAIfrzR$" role="3fr31v">
                                 <node concept="37vLTw" id="7oujAIfrzR_" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7oujAIfrzRC" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2rg" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="7oujAIfrzRA" role="2OqNvi">
                                   <node concept="chp4Y" id="7oujAIfrzRB" role="cj9EA">
@@ -5636,9 +5636,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7oujAIfrzRC" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2rg" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7oujAIfrzRD" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2rh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/behavior.mps
index 7ceba28356f..403a2fdd8aa 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/behavior.mps
@@ -8,7 +8,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
@@ -17,7 +16,6 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
-    <import index="7wpd" ref="c7a315e6-1d93-4186-85bc-2dfafd1ccc21/r:fb1c47d7-a72e-4e01-92dc-1e9f2ba4a118(com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.util)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" />
     <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" />
@@ -28,6 +26,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="evo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.newTypesystem.context(MPS.Core/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
+    <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -164,7 +163,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -185,7 +184,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -206,6 +205,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
@@ -213,6 +215,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -303,7 +306,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -347,7 +350,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -808,7 +810,7 @@
                         </node>
                         <node concept="2OqwBi" id="7F2vPZ3efv2" role="3uHU7B">
                           <node concept="37vLTw" id="7F2vPZ3efv3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7F2vPZ3ctAT" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qk" resolve="it" />
                           </node>
                           <node concept="2bSWHS" id="7F2vPZ3efv4" role="2OqNvi" />
                         </node>
@@ -861,7 +863,7 @@
                           </node>
                           <node concept="3EllGN" id="7F2vPZ3hp9X" role="37vLTJ">
                             <node concept="37vLTw" id="7F2vPZ3hpLZ" role="3ElVtu">
-                              <ref role="3cqZAo" node="7F2vPZ3ctAT" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qk" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="7F2vPZ3hnQZ" role="3ElQJh">
                               <ref role="3cqZAo" node="7F2vPZ3bwc8" resolve="newlines" />
@@ -880,9 +882,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7F2vPZ3ctAT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2qk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7F2vPZ3ctAU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ql" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -918,24 +920,24 @@
                       <node concept="3clFbF" id="7F2vPZ3hXan" role="3cqZAp">
                         <node concept="2OqwBi" id="7F2vPZ3hXao" role="3clFbG">
                           <node concept="37vLTw" id="7F2vPZ3hXap" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7F2vPZ3hXas" resolve="a" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qm" resolve="a" />
                           </node>
                           <node concept="2qgKlT" id="7F2vPZ3hXaq" role="2OqNvi">
                             <ref role="37wK5l" node="5x677oPovws" resolve="compareTo" />
                             <node concept="37vLTw" id="7F2vPZ3hXar" role="37wK5m">
-                              <ref role="3cqZAo" node="7F2vPZ3hXau" resolve="b" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qo" resolve="b" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7F2vPZ3hXas" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2qm" role="1bW2Oz">
                       <property role="TrG5h" value="a" />
-                      <node concept="2jxLKc" id="7F2vPZ3hXat" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2qn" role="1tU5fm" />
                     </node>
-                    <node concept="Rh6nW" id="7F2vPZ3hXau" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2qo" role="1bW2Oz">
                       <property role="TrG5h" value="b" />
-                      <node concept="2jxLKc" id="7F2vPZ3hXav" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2qp" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="7F2vPZ3hXaw" role="2Dq5b$">
@@ -1078,7 +1080,7 @@
                       <node concept="X8dFx" id="5LSSDsN$5wu" role="2OqNvi">
                         <node concept="2OqwBi" id="5LSSDsN$7GB" role="25WWJ7">
                           <node concept="37vLTw" id="5LSSDsN$6Ks" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5LSSDsN$1Vl" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qq" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5LSSDsN$azo" role="2OqNvi">
                             <ref role="3TtcxE" to="3673:7ueT7DHTBKa" resolve="typeMappings" />
@@ -1088,9 +1090,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5LSSDsN$1Vl" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2qq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5LSSDsN$1Vm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2qr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1201,7 +1203,7 @@
                       <node concept="X8dFx" id="5LSSDsN$Ffm" role="2OqNvi">
                         <node concept="2OqwBi" id="5LSSDsN$KzJ" role="25WWJ7">
                           <node concept="37vLTw" id="5LSSDsN$ILQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5LSSDsN$AGF" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qs" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="5LSSDsN$LJP" role="2OqNvi">
                             <ref role="37wK5l" node="2bBLuwRtGtC" resolve="effectiveEvaluators" />
@@ -1211,9 +1213,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5LSSDsN$AGF" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2qs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5LSSDsN$AGG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2qt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1386,7 +1388,7 @@
                                 <node concept="2OqwBi" id="7hawBYFJSXs" role="2Oq$k0">
                                   <node concept="2OqwBi" id="7hawBYFJSXt" role="2Oq$k0">
                                     <node concept="37vLTw" id="7hawBYFJSXu" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7hawBYFJSXy" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2qu" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7hawBYFJSXv" role="2OqNvi">
                                       <ref role="3Tt5mk" to="3673:7ueT7DHTBL8" resolve="concept" />
@@ -1400,9 +1402,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7hawBYFJSXy" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2qu" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7hawBYFJSXz" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2qv" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1425,7 +1427,7 @@
                         <node concept="3clFbF" id="7hawBYFOnGg" role="3cqZAp">
                           <node concept="2OqwBi" id="7hawBYFOnGh" role="3clFbG">
                             <node concept="37vLTw" id="7hawBYFOnGi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7hawBYFOnGk" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qw" resolve="it" />
                             </node>
                             <node concept="liA8E" id="7hawBYFOnGj" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
@@ -1433,9 +1435,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7hawBYFOnGk" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2qw" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7hawBYFOnGl" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2qx" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1529,13 +1531,13 @@
                           <node concept="1rXfSq" id="7F2vPZ5VRP8" role="3uHU7w">
                             <ref role="37wK5l" node="7F2vPZ5HCEU" resolve="getAliasOrName" />
                             <node concept="37vLTw" id="7F2vPZ5VRP9" role="37wK5m">
-                              <ref role="3cqZAo" node="7F2vPZ5Ryjw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qy" resolve="it" />
                             </node>
                           </node>
                         </node>
                         <node concept="3y3z36" id="7F2vPZ5VR4R" role="3uHU7B">
                           <node concept="37vLTw" id="7F2vPZ5VR4S" role="3uHU7B">
-                            <ref role="3cqZAo" node="7F2vPZ5Ryjw" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qy" resolve="it" />
                           </node>
                           <node concept="37vLTw" id="7F2vPZ5VR4T" role="3uHU7w">
                             <ref role="3cqZAo" node="7F2vPZ5RvH3" resolve="node" />
@@ -1544,9 +1546,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7F2vPZ5Ryjw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2qy" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7F2vPZ5Ryjx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2qz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2274,6 +2276,26 @@
                 </node>
               </node>
             </node>
+            <node concept="3cpWs8" id="3VJDHhkhJSO" role="3cqZAp">
+              <node concept="3cpWsn" id="3VJDHhkhJSP" role="3cpWs9">
+                <property role="TrG5h" value="th" />
+                <node concept="3uibUv" id="3VJDHhkhJKW" role="1tU5fm">
+                  <ref role="3uigEE" to="u78q:~TypeCheckerHelper" resolve="TypeCheckerHelper" />
+                </node>
+                <node concept="2OqwBi" id="3VJDHhkhJSQ" role="33vP2m">
+                  <node concept="2YIFZM" id="3VJDHhkhJSR" role="2Oq$k0">
+                    <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
+                    <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
+                  </node>
+                  <node concept="liA8E" id="3VJDHhkhJSS" role="2OqNvi">
+                    <ref role="37wK5l" to="1ka:~TypecheckingFacade.getData(java.lang.Class)" resolve="getData" />
+                    <node concept="3VsKOn" id="3VJDHhkhJST" role="37wK5m">
+                      <ref role="3VsUkX" to="u78q:~TypeCheckerHelper" resolve="TypeCheckerHelper" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="4Y8l6pbzF6m" role="3cqZAp">
               <node concept="37vLTI" id="4Y8l6pbzFmu" role="3clFbG">
                 <node concept="37vLTw" id="4Y8l6pbzFxQ" role="37vLTJ">
@@ -2282,11 +2304,13 @@
                 <node concept="2OqwBi" id="7c10t$7ejOz" role="37vLTx">
                   <node concept="2ShNRf" id="7c10t$7ejO$" role="2Oq$k0">
                     <node concept="1pGfFk" id="7c10t$7ejO_" role="2ShVmc">
-                      <ref role="37wK5l" to="evo:~TargetTypecheckingContext.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.TypeChecker)" resolve="TargetTypecheckingContext" />
+                      <ref role="37wK5l" to="evo:~TargetTypecheckingContext.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.TypeCheckerHelper)" resolve="TargetTypecheckingContext" />
                       <node concept="37vLTw" id="4Y8l6pbzabG" role="37wK5m">
                         <ref role="3cqZAo" node="4Y8l6pbz7_n" resolve="otherTypeExpr" />
                       </node>
-                      <node concept="2QUAEa" id="4Y8l6pbzaoa" role="37wK5m" />
+                      <node concept="37vLTw" id="3VJDHhkhKY_" role="37wK5m">
+                        <ref role="3cqZAo" node="3VJDHhkhJSP" resolve="th" />
+                      </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="7c10t$7ejOC" role="2OqNvi">
@@ -2679,7 +2703,7 @@
                         <node concept="3clFbF" id="53rYRk94Fgr" role="3cqZAp">
                           <node concept="2OqwBi" id="53rYRk94Fnm" role="3clFbG">
                             <node concept="37vLTw" id="53rYRk94Fgq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="53rYRk94F09" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2q$" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="53rYRk94G6e" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2687,9 +2711,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="53rYRk94F09" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2q$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="53rYRk94F0a" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2q_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3802,7 +3826,7 @@
                           <node concept="3clFbF" id="7F2vPZ36KWr" role="3cqZAp">
                             <node concept="2OqwBi" id="7F2vPZ36LnF" role="3clFbG">
                               <node concept="37vLTw" id="7F2vPZ36KWq" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7F2vPZ36K5x" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2qA" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="7F2vPZ36MCS" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -3810,9 +3834,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7F2vPZ36K5x" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2qA" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7F2vPZ36K5y" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2qB" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="1nlBCl" id="7F2vPZ36K5z" role="2S7zOq">
@@ -3846,7 +3870,7 @@
                           <node concept="3clFbF" id="7F2vPZ36Wi1" role="3cqZAp">
                             <node concept="2OqwBi" id="7F2vPZ36WNd" role="3clFbG">
                               <node concept="37vLTw" id="7F2vPZ36Wi0" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7F2vPZ36Vet" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2qC" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="7F2vPZ36YDS" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -3854,9 +3878,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7F2vPZ36Vet" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2qC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7F2vPZ36Veu" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2qD" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="1nlBCl" id="7F2vPZ36Vev" role="2S7zOq">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps
index a6e309387a8..5227ad5b08a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps
@@ -70,7 +70,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.migration.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.migration.mps
index fa19525572a..4653b33e2f6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.migration.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -51,12 +51,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -96,7 +97,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -120,7 +121,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -178,7 +178,7 @@
                           <node concept="2OqwBi" id="7hawBYFOSWZ" role="3clFbG">
                             <node concept="2OqwBi" id="7hawBYFOQQX" role="2Oq$k0">
                               <node concept="37vLTw" id="7hawBYFOQCY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7hawBYFOQyd" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2r2" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="7hawBYFOR9q" role="2OqNvi">
                                 <ref role="3TtcxE" to="3673:65E6xpGYBZE" resolve="applicableLanguages" />
@@ -188,9 +188,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7hawBYFOQyd" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2r2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7hawBYFOQye" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2r3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -202,7 +202,7 @@
                         <node concept="2OqwBi" id="7hawBYFOYUh" role="3clFbG">
                           <node concept="2OqwBi" id="7hawBYFOWQW" role="2Oq$k0">
                             <node concept="37vLTw" id="7hawBYFOWEy" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7hawBYFOWzD" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2r4" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="7hawBYFOXd_" role="2OqNvi">
                               <ref role="3TtcxE" to="3673:65E6xpGYBZE" resolve="applicableLanguages" />
@@ -212,9 +212,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7hawBYFOWzD" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2r4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7hawBYFOWzE" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2r5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/constraints.mps
index d69caa2c430..ca7cd072ccd 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/constraints.mps
@@ -68,7 +68,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,6 +98,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -159,7 +160,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -173,7 +174,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
@@ -273,7 +273,7 @@
                       <node concept="3clFbF" id="44OanfrlCr5" role="3cqZAp">
                         <node concept="2OqwBi" id="44OanfrlCr7" role="3clFbG">
                           <node concept="37vLTw" id="44OanfrlCr8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="44OanfrlCrd" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qE" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="44OanfrlCr9" role="2OqNvi">
                             <ref role="37wK5l" to="tpcn:73yVtVlWOga" resolve="isSubconceptOf" />
@@ -284,9 +284,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="44OanfrlCrd" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2qE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="44OanfrlCre" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2qF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -501,7 +501,7 @@
                         <node concept="3clFbF" id="2lop6rSg9vT" role="3cqZAp">
                           <node concept="2OqwBi" id="2lop6rSg9vU" role="3clFbG">
                             <node concept="37vLTw" id="2lop6rSg9vV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSg9vX" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qG" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2lop6rSg9vW" role="2OqNvi">
                               <ref role="3Tt5mk" to="3673:5LSSDsNpMLx" resolve="target" />
@@ -509,9 +509,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2lop6rSg9vX" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2qG" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2lop6rSg9vY" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2qH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/editor.mps
index 31df9adb7ab..7f1bf1d419c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/editor.mps
@@ -27,7 +27,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -88,7 +88,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -106,7 +106,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -142,7 +142,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -173,7 +173,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -237,7 +237,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -254,7 +254,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -291,7 +291,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/intentions.mps
index 5ca4a065055..a95c6996630 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/intentions.mps
@@ -59,7 +59,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -148,7 +148,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/plugin.mps
index 87541306ddd..11510852d15 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="47f075a6-558e-4640-a606-7ce0236c8023/r:9ffe1487-be32-45f7-abe0-e5fa20142da5(com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -21,7 +21,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/structure.mps
index 54aeaab3f9a..9bd59c61b28 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/structure.mps
@@ -56,7 +56,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/typesystem.mps
index 2b67082e8f2..7d47d151106 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/typesystem.mps
@@ -108,7 +108,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -135,6 +135,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -283,7 +284,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -322,7 +323,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1562299158920737514" name="initSize" index="3lWHg$" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -941,7 +941,7 @@
                           <ref role="ehGHo" to="3673:4_QpjDi2Mua" resolve="BaseLanguageTypeMapping" />
                         </node>
                         <node concept="37vLTw" id="4_QpjDjJWd7" role="33vP2m">
-                          <ref role="3cqZAo" node="4_QpjDjJRqN" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2qK" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -1107,22 +1107,22 @@
                             <node concept="3clFbS" id="7JF0K7yXMjg" role="1bW5cS">
                               <node concept="3clFbF" id="7JF0K7yXNKq" role="3cqZAp">
                                 <node concept="37vLTw" id="7JF0K7yXNKp" role="3clFbG">
-                                  <ref role="3cqZAo" node="7JF0K7yXMjh" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2qI" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7JF0K7yXMjh" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2qI" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7JF0K7yXMji" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2qJ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4_QpjDjJRqN" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2qK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4_QpjDjJRqO" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2qL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1675,7 +1675,7 @@
                         <node concept="2OqwBi" id="44jZT9psb2s" role="3uHU7B">
                           <node concept="2OqwBi" id="44jZT9psb2t" role="2Oq$k0">
                             <node concept="37vLTw" id="44jZT9psb2u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5LSSDsNV6LZ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qM" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="44jZT9psb2v" role="2OqNvi">
                               <ref role="3Tt5mk" to="3673:4_QpjDinOtz" resolve="fromType" />
@@ -1686,9 +1686,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5LSSDsNV6LZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2qM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5LSSDsNV6M0" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2qN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1840,7 +1840,7 @@
                           <node concept="3clFbF" id="44jZT9pwgLO" role="3cqZAp">
                             <node concept="2OqwBi" id="44jZT9pwgLP" role="3clFbG">
                               <node concept="37vLTw" id="44jZT9pwgLQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="44jZT9pwgLV" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2qO" resolve="it" />
                               </node>
                               <node concept="2Xjw5R" id="44jZT9pwgLR" role="2OqNvi">
                                 <node concept="1xMEDy" id="44jZT9pwgLS" role="1xVPHs">
@@ -1853,9 +1853,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="44jZT9pwgLV" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2qO" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="44jZT9pwgLW" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2qP" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1869,14 +1869,14 @@
                               <ref role="3cqZAo" node="5LSSDsNUU83" resolve="interpreter" />
                             </node>
                             <node concept="37vLTw" id="44jZT9pyUzg" role="3uHU7B">
-                              <ref role="3cqZAo" node="44jZT9pySqd" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qQ" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="44jZT9pySqd" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2qQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="44jZT9pySqe" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2qR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1952,7 +1952,7 @@
                           </node>
                           <node concept="2OqwBi" id="44jZT9px5Oe" role="3uHU7B">
                             <node concept="37vLTw" id="44jZT9px5G_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="44jZT9px3Zi" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qS" resolve="it" />
                             </node>
                             <node concept="2Xjw5R" id="44jZT9px7cY" role="2OqNvi">
                               <node concept="1xMEDy" id="44jZT9px7d0" role="1xVPHs">
@@ -1966,9 +1966,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="44jZT9px3Zi" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2qS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="44jZT9px3Zj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2qT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1988,7 +1988,7 @@
                         <node concept="3cpWs3" id="44jZT9pxCeC" role="3clFbG">
                           <node concept="2OqwBi" id="44jZT9pxFqH" role="3uHU7w">
                             <node concept="37vLTw" id="44jZT9pxCf5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="44jZT9pui_P" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2qU" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="44jZT9pxH9Z" role="2OqNvi">
                               <ref role="37wK5l" to="kqnq:7JF0K7yNgd7" resolve="getTypedPresentation" />
@@ -2014,7 +2014,7 @@
                                 <node concept="2OqwBi" id="44jZT9pxA4P" role="3uHU7B">
                                   <node concept="2OqwBi" id="44jZT9pxA4Q" role="2Oq$k0">
                                     <node concept="37vLTw" id="44jZT9pxA4R" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="44jZT9pui_P" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2qU" resolve="it" />
                                     </node>
                                     <node concept="2Xjw5R" id="44jZT9pxA4S" role="2OqNvi">
                                       <node concept="1xMEDy" id="44jZT9pxA4T" role="1xVPHs">
@@ -2039,9 +2039,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="44jZT9pui_P" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2qU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="44jZT9pui_Q" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2qV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2369,7 +2369,7 @@
                       <node concept="3clFbF" id="7F2vPZ37BoV" role="3cqZAp">
                         <node concept="2OqwBi" id="7F2vPZ37BPb" role="3clFbG">
                           <node concept="37vLTw" id="7F2vPZ37BoU" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7F2vPZ37_Ye" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2qW" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7F2vPZ37D7B" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2377,9 +2377,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7F2vPZ37_Ye" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2qW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7F2vPZ37_Yf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2qX" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="7F2vPZ37_Yh" role="2S7zOq">
@@ -2406,7 +2406,7 @@
                     <node concept="17R0WA" id="5I6_y3Zd4Gy" role="3clFbG">
                       <node concept="2OqwBi" id="5I6_y3Zd6E8" role="3uHU7w">
                         <node concept="37vLTw" id="5I6_y3Zd5K$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5I6_y3ZcGGk" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2qY" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5I6_y3ZdcZ2" role="2OqNvi">
                           <ref role="3Tt5mk" to="3673:7ueT7DHTBL8" resolve="concept" />
@@ -2423,9 +2423,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5I6_y3ZcGGk" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2qY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5I6_y3ZcGGl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2qZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2444,7 +2444,7 @@
                       <node concept="2qgKlT" id="35ZE6VW2d41" role="2OqNvi">
                         <ref role="37wK5l" to="kqnq:5x677oPovws" resolve="compareTo" />
                         <node concept="37vLTw" id="35ZE6VW2d42" role="37wK5m">
-                          <ref role="3cqZAo" node="5I6_y3Zdi8$" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2r0" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -2458,7 +2458,7 @@
                     </node>
                     <node concept="2OqwBi" id="5x677oP9SgO" role="33vP2m">
                       <node concept="37vLTw" id="5x677oP9SgP" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5I6_y3Zdi8$" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2r0" resolve="it" />
                       </node>
                       <node concept="2Xjw5R" id="5x677oP9SgQ" role="2OqNvi">
                         <node concept="1xMEDy" id="5x677oP9SgR" role="1xVPHs">
@@ -2494,7 +2494,7 @@
                         <node concept="3cpWs3" id="5x677oP7XSq" role="33vP2m">
                           <node concept="2OqwBi" id="5x677oP7XSr" role="3uHU7w">
                             <node concept="37vLTw" id="5x677oP7XSs" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5I6_y3Zdi8$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2r0" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5x677oP7XSt" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2558,7 +2558,7 @@
                       <node concept="3eOSWO" id="35ZE6VW2xbQ" role="3uHU7w">
                         <node concept="2OqwBi" id="35ZE6VW2zMc" role="3uHU7w">
                           <node concept="37vLTw" id="35ZE6VW2xT2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5I6_y3Zdi8$" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2r0" resolve="it" />
                           </node>
                           <node concept="2bSWHS" id="35ZE6VW2Arr" role="2OqNvi" />
                         </node>
@@ -2588,7 +2588,7 @@
                         <node concept="3cpWs3" id="35ZE6VW3qhW" role="a7wSD">
                           <node concept="2OqwBi" id="35ZE6VW3sJr" role="3uHU7w">
                             <node concept="37vLTw" id="35ZE6VW3r6t" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5I6_y3Zdi8$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2r0" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="35ZE6VW3vC5" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2616,9 +2616,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="5I6_y3Zdi8$" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2r0" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="5I6_y3Zdi8_" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2r1" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/com.mbeddr.mpsutil.interpreter.runtime.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/com.mbeddr.mpsutil.interpreter.runtime.msd
index f73c59dd1c6..14b097dbca5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/com.mbeddr.mpsutil.interpreter.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/com.mbeddr.mpsutil.interpreter.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.interpreter.rt" uuid="735f86bc-17fb-4d1c-a664-82c2b8e8a34e" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.interpreter.rt" uuid="735f86bc-17fb-4d1c-a664-82c2b8e8a34e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -27,7 +26,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
index 37fe70cfc8e..e1197d94791 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
@@ -55,7 +55,7 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
-      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
         <child id="2323553266850475953" name="modifiers" index="2frcjj" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
@@ -70,7 +70,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -159,7 +159,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -235,7 +235,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -270,7 +270,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -338,6 +338,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -427,7 +428,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -650,6 +651,7 @@
   </node>
   <node concept="3HP615" id="4X7QcQ36WR7">
     <property role="TrG5h" value="IInterpreter" />
+    <node concept="3Tm1VV" id="4X7QcQ36WR8" role="1B3o_S" />
     <node concept="3clFb_" id="2PA_oGdoAzN" role="jymVt">
       <property role="TrG5h" value="getCategory" />
       <node concept="3clFbS" id="2PA_oGdoAzQ" role="3clF47">
@@ -662,7 +664,6 @@
       <node concept="2JFqV2" id="2PA_oGdp9bO" role="2frcjj" />
     </node>
     <node concept="2tJIrI" id="2PA_oGdo$9S" role="jymVt" />
-    <node concept="3Tm1VV" id="4X7QcQ36WR8" role="1B3o_S" />
     <node concept="3clFb_" id="2X4$XGmegKw" role="jymVt">
       <property role="TrG5h" value="evaluate" />
       <node concept="3uibUv" id="2X4$XGmegKx" role="3clF45">
@@ -1824,7 +1825,7 @@
                               <node concept="3clFbF" id="7RXj7bkDdR5" role="3cqZAp">
                                 <node concept="2OqwBi" id="7RXj7bkDdR6" role="3clFbG">
                                   <node concept="37vLTw" id="7RXj7bkDdR7" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7RXj7bkDdRa" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Ce" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="7RXj7bkDdR8" role="2OqNvi">
                                     <node concept="chp4Y" id="7RXj7bkDdR9" role="cj9EA">
@@ -1834,9 +1835,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7RXj7bkDdRa" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2Ce" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7RXj7bkDdRb" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2Cf" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3312,7 +3313,7 @@
                         </node>
                         <node concept="2OqwBi" id="5RIakkDJ6ZO" role="2Oq$k0">
                           <node concept="37vLTw" id="5RIakkDJ6ZP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4_QpjDhw8_j" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Cg" resolve="it" />
                           </node>
                           <node concept="2NL2c5" id="5RIakkDJ6ZQ" role="2OqNvi" />
                         </node>
@@ -3331,9 +3332,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4_QpjDhw8_j" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Cg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4_QpjDhw8_k" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Ch" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4674,7 +4675,7 @@
                       <node concept="X8dFx" id="7oujAIfqI8d" role="2OqNvi">
                         <node concept="2OqwBi" id="7oujAIfqILN" role="25WWJ7">
                           <node concept="37vLTw" id="7oujAIfqI_$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7oujAIfqEXk" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ci" resolve="it" />
                           </node>
                           <node concept="liA8E" id="7oujAIfqJhC" role="2OqNvi">
                             <ref role="37wK5l" node="6ENu_m7ttZY" resolve="listEvaluators" />
@@ -4684,9 +4685,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7oujAIfqEXk" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ci" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7oujAIfqEXl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Cj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4738,7 +4739,7 @@
                       <node concept="X8dFx" id="7oujAIfqOZl" role="2OqNvi">
                         <node concept="2OqwBi" id="7oujAIfqPCn" role="25WWJ7">
                           <node concept="37vLTw" id="7oujAIfqPsM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7oujAIfqMeV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ck" resolve="it" />
                           </node>
                           <node concept="liA8E" id="7oujAIfqQ8O" role="2OqNvi">
                             <ref role="37wK5l" node="6ENu_m7tEf$" resolve="listTypeMappers" />
@@ -4748,9 +4749,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7oujAIfqMeV" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ck" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7oujAIfqMeW" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Cl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4802,7 +4803,7 @@
                       <node concept="X8dFx" id="7oujAIfpUC$" role="2OqNvi">
                         <node concept="2OqwBi" id="7oujAIfpVk2" role="25WWJ7">
                           <node concept="37vLTw" id="7oujAIfpV7v" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7oujAIfpOOj" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Cm" resolve="it" />
                           </node>
                           <node concept="liA8E" id="7oujAIfpW0t" role="2OqNvi">
                             <ref role="37wK5l" node="27Skbdzlvlf" resolve="listRelationships" />
@@ -4812,9 +4813,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7oujAIfpOOj" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Cm" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7oujAIfpOOk" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Cn" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7476,7 +7477,7 @@
                       <node concept="2OqwBi" id="3A1kd46$o$6" role="3clFbG">
                         <node concept="2OqwBi" id="3A1kd46$nhJ" role="2Oq$k0">
                           <node concept="37vLTw" id="3A1kd46$mVo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3A1kd46$mz5" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Cq" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3A1kd46$nR5" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
@@ -7488,9 +7489,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3A1kd46$mz5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Cq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3A1kd46$mz6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Cr" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="3A1kd46$mz7" role="2S7zOq">
@@ -7537,15 +7538,15 @@
                       <node concept="liA8E" id="3zYUNYHU7g0" role="2OqNvi">
                         <ref role="37wK5l" to="gtp9:9NO9Tq8VL5" resolve="addNode" />
                         <node concept="37vLTw" id="3zYUNYHU8tN" role="37wK5m">
-                          <ref role="3cqZAo" node="3zYUNYHU5va" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Cs" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3zYUNYHU5va" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Cs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3zYUNYHU5vb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Ct" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8022,7 +8023,7 @@
                           <node concept="3cpWs3" id="1bn7_GpSkLc" role="3clFbG">
                             <node concept="2OqwBi" id="1bn7_GpSnZT" role="3uHU7w">
                               <node concept="37vLTw" id="1bn7_GpSlYJ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1bn7_GpRTPG" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Cu" resolve="it" />
                               </node>
                               <node concept="3AV6Ez" id="1bn7_GpSoXu" role="2OqNvi" />
                             </node>
@@ -8032,7 +8033,7 @@
                                   <node concept="2OqwBi" id="6tcu$9ntHJM" role="3uHU7B">
                                     <node concept="2OqwBi" id="1bn7_GpS0ut" role="2Oq$k0">
                                       <node concept="37vLTw" id="1bn7_GpRZZ0" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1bn7_GpRTPG" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2Cu" resolve="it" />
                                       </node>
                                       <node concept="3AY5_j" id="1bn7_GpS1GC" role="2OqNvi" />
                                     </node>
@@ -8046,7 +8047,7 @@
                                   <node concept="2JrnkZ" id="1bn7_GpSd6x" role="2Oq$k0">
                                     <node concept="2OqwBi" id="1bn7_GpSaf_" role="2JrQYb">
                                       <node concept="37vLTw" id="1bn7_GpS8Y$" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1bn7_GpRTPG" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2Cu" resolve="it" />
                                       </node>
                                       <node concept="3AY5_j" id="1bn7_GpSb0Z" role="2OqNvi" />
                                     </node>
@@ -8063,9 +8064,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1bn7_GpRTPG" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Cu" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1bn7_GpRTPH" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Cv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -9142,7 +9143,7 @@
                       <property role="RRSoG" value="gZ5frni/trace" />
                       <node concept="3cpWs3" id="6CABoWpWtGV" role="RRSoy">
                         <node concept="37vLTw" id="6CABoWpWtH9" role="3uHU7w">
-                          <ref role="3cqZAo" node="6CABoWpWkds" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Cw" resolve="it" />
                         </node>
                         <node concept="Xl_RD" id="6CABoWpWqCO" role="3uHU7B">
                           <property role="Xl_RC" value="trying IInterpreter " />
@@ -9154,7 +9155,7 @@
                         <node concept="2OqwBi" id="6CABoWpWkdl" role="2Oq$k0">
                           <node concept="2OqwBi" id="6CABoWpWkdm" role="2Oq$k0">
                             <node concept="37vLTw" id="6CABoWpWkdn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6CABoWpWkds" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Cw" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6CABoWpWkdo" role="2OqNvi">
                               <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
@@ -9173,9 +9174,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6CABoWpWkds" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Cw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6CABoWpWkdt" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Cx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9210,6 +9211,7 @@
         <node concept="17QB3L" id="6CABoWpTEBr" role="1tU5fm" />
       </node>
     </node>
+    <node concept="3Tm1VV" id="4jkUBhBVMPT" role="1B3o_S" />
     <node concept="2tJIrI" id="2PA_oGdvose" role="jymVt" />
     <node concept="2YIFZL" id="2PA_oGfak8K" role="jymVt">
       <property role="TrG5h" value="findAllInterpreterExecutables" />
@@ -9297,7 +9299,6 @@
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="4jkUBhBVMPT" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="4N5UlZR9g6v">
     <property role="TrG5h" value="IEnvironmentId" />
@@ -9714,7 +9715,7 @@
                                 <node concept="3cpWs3" id="4N5UlZR9g9y" role="3clFbG">
                                   <node concept="2OqwBi" id="4N5UlZR9g9z" role="3uHU7w">
                                     <node concept="37vLTw" id="4N5UlZR9g9$" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4N5UlZR9g9Q" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Cy" resolve="it" />
                                     </node>
                                     <node concept="3AV6Ez" id="4N5UlZR9g9_" role="2OqNvi" />
                                   </node>
@@ -9724,7 +9725,7 @@
                                         <node concept="2OqwBi" id="4N5UlZR9g9D" role="3uHU7B">
                                           <node concept="2OqwBi" id="4N5UlZR9g9E" role="2Oq$k0">
                                             <node concept="37vLTw" id="4N5UlZR9g9F" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4N5UlZR9g9Q" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2Cy" resolve="it" />
                                             </node>
                                             <node concept="3AY5_j" id="4N5UlZR9g9G" role="2OqNvi" />
                                           </node>
@@ -9740,7 +9741,7 @@
                                         <node concept="2JrnkZ" id="4N5UlZR9g9K" role="2Oq$k0">
                                           <node concept="2OqwBi" id="4N5UlZR9g9L" role="2JrQYb">
                                             <node concept="37vLTw" id="4N5UlZR9g9M" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4N5UlZR9g9Q" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2Cy" resolve="it" />
                                             </node>
                                             <node concept="3AY5_j" id="4N5UlZR9g9N" role="2OqNvi" />
                                           </node>
@@ -9757,9 +9758,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4N5UlZR9g9Q" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2Cy" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4N5UlZR9g9R" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2Cz" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -9788,7 +9789,7 @@
                               <node concept="2OqwBi" id="4N5UlZR9ga3" role="3uHU7B">
                                 <node concept="2OqwBi" id="4N5UlZR9ga4" role="2Oq$k0">
                                   <node concept="37vLTw" id="4N5UlZR9ga5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4N5UlZR9gad" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2C$" resolve="it" />
                                   </node>
                                   <node concept="3AY5_j" id="4N5UlZR9ga6" role="2OqNvi" />
                                 </node>
@@ -9799,7 +9800,7 @@
                               <node concept="2OqwBi" id="4N5UlZR9ga8" role="3uHU7w">
                                 <node concept="2OqwBi" id="4N5UlZR9ga9" role="2Oq$k0">
                                   <node concept="37vLTw" id="4N5UlZR9gaa" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4N5UlZR9gad" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2C$" resolve="it" />
                                   </node>
                                   <node concept="3AV6Ez" id="4N5UlZR9gab" role="2OqNvi" />
                                 </node>
@@ -9808,9 +9809,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4N5UlZR9gad" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2C$" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4N5UlZR9gae" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2C_" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -10118,7 +10119,7 @@
                               <node concept="3cpWs3" id="4N5UlZR9gcn" role="3clFbG">
                                 <node concept="2OqwBi" id="4N5UlZR9gco" role="3uHU7w">
                                   <node concept="37vLTw" id="4N5UlZR9gcp" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4N5UlZR9gcy" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2CA" resolve="it" />
                                   </node>
                                   <node concept="3AV6Ez" id="4N5UlZR9gcq" role="2OqNvi" />
                                 </node>
@@ -10126,7 +10127,7 @@
                                   <node concept="2OqwBi" id="4N5UlZR9gcs" role="3uHU7B">
                                     <node concept="2OqwBi" id="4N5UlZR9gct" role="2Oq$k0">
                                       <node concept="37vLTw" id="4N5UlZR9gcu" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4N5UlZR9gcy" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2CA" resolve="it" />
                                       </node>
                                       <node concept="3AY5_j" id="4N5UlZR9gcv" role="2OqNvi" />
                                     </node>
@@ -10141,9 +10142,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4N5UlZR9gcy" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2CA" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4N5UlZR9gcz" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2CB" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -11246,7 +11247,7 @@
                                 <node concept="3JPx81" id="2pogikSwmNN" role="2OqNvi">
                                   <node concept="2OqwBi" id="2pogikSwmNO" role="25WWJ7">
                                     <node concept="37vLTw" id="2pogikSwmNP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2pogikSwdEd" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2CC" resolve="it" />
                                     </node>
                                     <node concept="2NL2c5" id="44TucI34SWn" role="2OqNvi" />
                                   </node>
@@ -11255,9 +11256,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2pogikSwdEd" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2CC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2pogikSwdEe" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2CD" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -11285,7 +11286,7 @@
                             <node concept="liA8E" id="7oujAIft56n" role="2OqNvi">
                               <ref role="37wK5l" node="7oujAIft2qt" resolve="isEvaluable" />
                               <node concept="37vLTw" id="7oujAIft5pB" role="37wK5m">
-                                <ref role="3cqZAo" node="7oujAIfsU8k" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2CE" resolve="it" />
                               </node>
                               <node concept="37vLTw" id="7oujAIft8j4" role="37wK5m">
                                 <ref role="3cqZAo" node="7oujAIfsGZx" resolve="context" />
@@ -11294,9 +11295,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7oujAIfsU8k" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2CE" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7oujAIfsU8l" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2CF" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11454,7 +11455,7 @@
                       <node concept="X8dFx" id="2pogikRxM7W" role="2OqNvi">
                         <node concept="2OqwBi" id="2pogikRxM7X" role="25WWJ7">
                           <node concept="37vLTw" id="2pogikRxM7Y" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2pogikRxM80" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2CG" resolve="it" />
                           </node>
                           <node concept="liA8E" id="2pogikRxM7Z" role="2OqNvi">
                             <ref role="37wK5l" node="7oujAIfiLVh" resolve="listEvaluators" />
@@ -11464,9 +11465,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2pogikRxM80" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2CG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2pogikRxM81" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2CH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11518,7 +11519,7 @@
                       <node concept="X8dFx" id="2pogikRxM8o" role="2OqNvi">
                         <node concept="2OqwBi" id="2pogikRxM8p" role="25WWJ7">
                           <node concept="37vLTw" id="2pogikRxM8q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2pogikRxM8s" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2CI" resolve="it" />
                           </node>
                           <node concept="liA8E" id="2pogikRxM8r" role="2OqNvi">
                             <ref role="37wK5l" node="6ENu_m7tEf$" resolve="listTypeMappers" />
@@ -11528,9 +11529,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2pogikRxM8s" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2CI" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2pogikRxM8t" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2CJ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11582,7 +11583,7 @@
                       <node concept="X8dFx" id="2pogikRxM8O" role="2OqNvi">
                         <node concept="2OqwBi" id="2pogikRxM8P" role="25WWJ7">
                           <node concept="37vLTw" id="2pogikRxM8Q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2pogikRxM8S" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2CK" resolve="it" />
                           </node>
                           <node concept="liA8E" id="2pogikRxM8R" role="2OqNvi">
                             <ref role="37wK5l" node="27Skbdzlvlf" resolve="listRelationships" />
@@ -11592,9 +11593,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2pogikRxM8S" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2CK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2pogikRxM8T" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2CL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12555,13 +12556,13 @@
                 <node concept="3clFbS" id="6t6gMvcN9MR" role="1bW5cS">
                   <node concept="3clFbF" id="6t6gMvcNa8Z" role="3cqZAp">
                     <node concept="37vLTw" id="6t6gMvcNa8Y" role="3clFbG">
-                      <ref role="3cqZAo" node="6t6gMvcN9MS" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN2CM" resolve="it" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6t6gMvcN9MS" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2CM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6t6gMvcN9MT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2CN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12678,7 +12679,7 @@
                               <node concept="3EllGN" id="6t6gMvcMZwo" role="37vLTJ">
                                 <node concept="2OqwBi" id="6t6gMvcMZOS" role="3ElVtu">
                                   <node concept="37vLTw" id="6t6gMvcMZFn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="17VgZX4hl9V" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2CO" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="6t6gMvcN08E" role="2OqNvi">
                                     <ref role="3TsBF5" to="3673:7jJIR9e5_JR" resolve="category" />
@@ -12699,7 +12700,7 @@
                             <node concept="2Nt0df" id="6t6gMvcMY1c" role="2OqNvi">
                               <node concept="2OqwBi" id="6t6gMvcMYge" role="38cxEo">
                                 <node concept="37vLTw" id="6t6gMvcMY7X" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="17VgZX4hl9V" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2CO" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6t6gMvcMYVz" role="2OqNvi">
                                   <ref role="3TsBF5" to="3673:7jJIR9e5_JR" resolve="category" />
@@ -12714,7 +12715,7 @@
                           <node concept="3EllGN" id="6t6gMvcN2D9" role="2Oq$k0">
                             <node concept="2OqwBi" id="6t6gMvcN317" role="3ElVtu">
                               <node concept="37vLTw" id="6t6gMvcN2Oq" role="2Oq$k0">
-                                <ref role="3cqZAo" node="17VgZX4hl9V" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2CO" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="6t6gMvcN3$B" role="2OqNvi">
                                 <ref role="3TsBF5" to="3673:7jJIR9e5_JR" resolve="category" />
@@ -12726,15 +12727,15 @@
                           </node>
                           <node concept="TSZUe" id="6t6gMvcN6TN" role="2OqNvi">
                             <node concept="37vLTw" id="6t6gMvcN7mv" role="25WWJ7">
-                              <ref role="3cqZAo" node="17VgZX4hl9V" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2CO" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="17VgZX4hl9V" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2CO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="17VgZX4hl9W" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2CP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -12953,7 +12954,7 @@
                       <node concept="2OqwBi" id="2tBbuXW_WGn" role="3uHU7w">
                         <node concept="2OqwBi" id="2tBbuXW_WGo" role="2Oq$k0">
                           <node concept="37vLTw" id="2tBbuXW_WGp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2tBbuXW_WGy" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2CQ" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2tBbuXW_WGq" role="2OqNvi">
                             <ref role="3TsBF5" to="3673:7jJIR9e5_JR" resolve="category" />
@@ -12969,7 +12970,7 @@
                       <node concept="3y3z36" id="2tBbuXW_WGt" role="3uHU7B">
                         <node concept="2OqwBi" id="2tBbuXW_WGu" role="3uHU7B">
                           <node concept="37vLTw" id="2tBbuXW_WGv" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2tBbuXW_WGy" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2CQ" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2tBbuXW_WGw" role="2OqNvi">
                             <ref role="3TsBF5" to="3673:7jJIR9e5_JR" resolve="category" />
@@ -12980,9 +12981,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2tBbuXW_WGy" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2CQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2tBbuXW_WGz" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2CR" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14198,7 +14199,7 @@
                         <node concept="1rXfSq" id="5$eeMt9ijgL" role="3uHU7w">
                           <ref role="37wK5l" node="50LzNoS$OdG" resolve="hasInvalidProperties" />
                           <node concept="37vLTw" id="5$eeMt9ijgM" role="37wK5m">
-                            <ref role="3cqZAo" node="5$eeMt9ijgY" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2CU" resolve="it" />
                           </node>
                         </node>
                         <node concept="22lmx$" id="5$eeMt9ijgN" role="3uHU7B">
@@ -14207,36 +14208,36 @@
                               <node concept="1rXfSq" id="5$eeMt9ijgQ" role="3uHU7B">
                                 <ref role="37wK5l" node="50LzNoSxTSx" resolve="isNodeNull" />
                                 <node concept="37vLTw" id="5$eeMt9ijgR" role="37wK5m">
-                                  <ref role="3cqZAo" node="5$eeMt9ijgY" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2CU" resolve="it" />
                                 </node>
                               </node>
                               <node concept="1rXfSq" id="5$eeMt9ijgS" role="3uHU7w">
                                 <ref role="37wK5l" node="50LzNoSxTKY" resolve="isNodeAbstract" />
                                 <node concept="37vLTw" id="5$eeMt9ijgT" role="37wK5m">
-                                  <ref role="3cqZAo" node="5$eeMt9ijgY" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2CU" resolve="it" />
                                 </node>
                               </node>
                             </node>
                             <node concept="1rXfSq" id="5$eeMt9ijgU" role="3uHU7w">
                               <ref role="37wK5l" node="50LzNoSxTyt" resolve="hasMissingChildren" />
                               <node concept="37vLTw" id="5$eeMt9ijgV" role="37wK5m">
-                                <ref role="3cqZAo" node="5$eeMt9ijgY" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2CU" resolve="it" />
                               </node>
                             </node>
                           </node>
                           <node concept="1rXfSq" id="5$eeMt9ijgW" role="3uHU7w">
                             <ref role="37wK5l" node="50LzNoSxTkU" resolve="hasMissingReferences" />
                             <node concept="37vLTw" id="5$eeMt9ijgX" role="37wK5m">
-                              <ref role="3cqZAo" node="5$eeMt9ijgY" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2CU" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5$eeMt9ijgY" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2CU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5$eeMt9ijgZ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2CV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -14336,7 +14337,7 @@
                       <node concept="3fqX7Q" id="50LzNoSxvhe" role="3clFbG">
                         <node concept="2OqwBi" id="50LzNoSxvhf" role="3fr31v">
                           <node concept="37vLTw" id="50LzNoSxvhg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="50LzNoSxvhi" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2CW" resolve="it" />
                           </node>
                           <node concept="liA8E" id="50LzNoSxvhh" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractLink.isOptional()" resolve="isOptional" />
@@ -14345,9 +14346,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="50LzNoSxvhi" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2CW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="50LzNoSxvhj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2CX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -14368,7 +14369,7 @@
                             <node concept="liA8E" id="50LzNoSxvhu" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SNode.getChildren(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="getChildren" />
                               <node concept="37vLTw" id="50LzNoSxvhv" role="37wK5m">
-                                <ref role="3cqZAo" node="50LzNoSxvhz" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2CY" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -14381,9 +14382,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="50LzNoSxvhz" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2CY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="50LzNoSxvh$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2CZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14433,7 +14434,7 @@
                       <node concept="3fqX7Q" id="50LzNoSxvT1" role="3clFbG">
                         <node concept="2OqwBi" id="50LzNoSxvT2" role="3fr31v">
                           <node concept="37vLTw" id="50LzNoSxvT3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="50LzNoSxvT5" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2D0" resolve="it" />
                           </node>
                           <node concept="liA8E" id="50LzNoSxvT4" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractLink.isOptional()" resolve="isOptional" />
@@ -14442,9 +14443,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="50LzNoSxvT5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2D0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="50LzNoSxvT6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2D1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -14464,16 +14465,16 @@
                         <node concept="liA8E" id="50LzNoSxvTg" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SNode.getReference(org.jetbrains.mps.openapi.language.SReferenceLink)" resolve="getReference" />
                           <node concept="37vLTw" id="50LzNoSxvTh" role="37wK5m">
-                            <ref role="3cqZAo" node="50LzNoSxvTi" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2D2" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="50LzNoSxvTi" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2D2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="50LzNoSxvTj" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2D3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14524,7 +14525,7 @@
                     <node concept="3fqX7Q" id="50LzNoS$PLi" role="3clFbG">
                       <node concept="2OqwBi" id="50LzNoS$PLk" role="3fr31v">
                         <node concept="37vLTw" id="50LzNoS$PLl" role="2Oq$k0">
-                          <ref role="3cqZAo" node="50LzNoS$Pr$" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2D4" resolve="it" />
                         </node>
                         <node concept="liA8E" id="50LzNoS$PLm" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SProperty.isValid(java.lang.String)" resolve="isValid" />
@@ -14537,7 +14538,7 @@
                             <node concept="liA8E" id="50LzNoS$QhT" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
                               <node concept="37vLTw" id="50LzNoS$QmB" role="37wK5m">
-                                <ref role="3cqZAo" node="50LzNoS$Pr$" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2D4" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -14546,9 +14547,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="50LzNoS$Pr$" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2D4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="50LzNoS$Pr_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2D5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -16580,7 +16581,7 @@
                   <node concept="3clFbF" id="1FJItaveJmf" role="3cqZAp">
                     <node concept="2OqwBi" id="1FJItaveJAn" role="3clFbG">
                       <node concept="37vLTw" id="1FJItaveJme" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1FJItaveJc2" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2D6" resolve="it" />
                       </node>
                       <node concept="liA8E" id="1FJItaveMSm" role="2OqNvi">
                         <ref role="37wK5l" node="1FJItaveKwF" resolve="representsNode" />
@@ -16591,9 +16592,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1FJItaveJc2" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2D6" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1FJItaveJc3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2D7" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -17922,7 +17923,7 @@
                             </node>
                             <node concept="2OqwBi" id="6LLJO$vZjaQ" role="3uHU7w">
                               <node concept="37vLTw" id="6LLJO$vZiEJ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6LLJO$vZ2AM" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2D8" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6LLJO$vZjSy" role="2OqNvi">
                                 <ref role="37wK5l" node="6LLJO$xvvEt" resolve="toString" />
@@ -17934,9 +17935,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6LLJO$vZ2AM" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2D8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6LLJO$vZ2AN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2D9" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/com.mbeddr.mpsutil.jfreechart.sandboxlang.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/com.mbeddr.mpsutil.jfreechart.sandboxlang.mpl
index 4513ddf2946..52fa21e0883 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/com.mbeddr.mpsutil.jfreechart.sandboxlang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/com.mbeddr.mpsutil.jfreechart.sandboxlang.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/behavior.mps
index 0ec5d5403b3..c69276d35fe 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/behavior.mps
@@ -72,7 +72,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -84,7 +84,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/editor.mps
index c6b08920468..1f99eec3563 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/editor.mps
@@ -58,7 +58,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -123,7 +123,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -135,7 +135,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -160,7 +160,7 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/structure.mps
index d549cfef7f0..c132f5982b3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart.sandboxlang/models/structure.mps
@@ -37,7 +37,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart/com.mbeddr.mpsutil.jfreechart.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart/com.mbeddr.mpsutil.jfreechart.mpl
index b893d7ff6cd..ff0f2ed8f90 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart/com.mbeddr.mpsutil.jfreechart.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jfreechart/com.mbeddr.mpsutil.jfreechart.mpl
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/com.mbeddr.mpsutil.json.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/com.mbeddr.mpsutil.json.mpl
index 740b38e7784..d8ce2ccfdbb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/com.mbeddr.mpsutil.json.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/com.mbeddr.mpsutil.json.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -26,7 +25,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -45,7 +44,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps
index f1c824dfc3e..b2cffeac2e9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps
@@ -6,7 +6,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@@ -57,7 +57,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -140,7 +140,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -164,7 +164,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -185,6 +185,7 @@
       <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -242,7 +243,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -262,7 +263,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
     </language>
@@ -436,7 +436,7 @@
                             <node concept="37vLTI" id="55Y4t6T5tua" role="3clFbG">
                               <node concept="2OqwBi" id="55Y4t6ST4Vm" role="37vLTJ">
                                 <node concept="37vLTw" id="55Y4t6ST4Ln" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="55Y4t6ST3Yo" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2rj" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="55Y4t6ST5cG" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
@@ -445,7 +445,7 @@
                               <node concept="3cpWs3" id="55Y4t6T5xTn" role="37vLTx">
                                 <node concept="2OqwBi" id="55Y4t6T5yCo" role="3uHU7w">
                                   <node concept="37vLTw" id="55Y4t6T5yeE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="55Y4t6ST3Yo" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2rj" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="55Y4t6T9J8r" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
@@ -468,9 +468,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="55Y4t6ST3Yo" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2rj" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="55Y4t6ST3Yp" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2rk" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -595,6 +595,46 @@
           </node>
         </node>
         <node concept="3J1_TO" id="6pzXh8ftxCM" role="3cqZAp">
+          <node concept="3uVAMA" id="6pzXh8ftxCE" role="1zxBo5">
+            <node concept="XOnhg" id="6pzXh8ftxCG" role="1zc67B">
+              <property role="3TUv4t" value="false" />
+              <property role="TrG5h" value="e" />
+              <node concept="nSUau" id="HzqgCR2R8u" role="1tU5fm">
+                <node concept="3uibUv" id="6pzXh8ftxCH" role="nSUat">
+                  <ref role="3uigEE" to="i4mf:~JsonProcessingException" resolve="JsonProcessingException" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="6pzXh8ftxCF" role="1zc67A">
+              <node concept="RRSsy" id="72Ne6Stc96M" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fh_4/error" />
+                <node concept="37vLTw" id="72Ne6Stc96Q" role="RRSow">
+                  <ref role="3cqZAo" node="6pzXh8ftxCG" resolve="e" />
+                </node>
+                <node concept="Xl_RD" id="72Ne6Stc96O" role="RRSoy" />
+              </node>
+            </node>
+          </node>
+          <node concept="3uVAMA" id="6pzXh8ftxCI" role="1zxBo5">
+            <node concept="XOnhg" id="6pzXh8ftxCK" role="1zc67B">
+              <property role="3TUv4t" value="false" />
+              <property role="TrG5h" value="e" />
+              <node concept="nSUau" id="HzqgCR2R8A" role="1tU5fm">
+                <node concept="3uibUv" id="6pzXh8ftxCL" role="nSUat">
+                  <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="6pzXh8ftxCJ" role="1zc67A">
+              <node concept="RRSsy" id="72Ne6Stc9sA" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fh_4/error" />
+                <node concept="37vLTw" id="72Ne6Stc9sE" role="RRSow">
+                  <ref role="3cqZAo" node="6pzXh8ftxCK" resolve="e" />
+                </node>
+                <node concept="Xl_RD" id="72Ne6Stc9sC" role="RRSoy" />
+              </node>
+            </node>
+          </node>
           <node concept="3clFbS" id="6pzXh8ftxCN" role="1zxBo7">
             <node concept="3cpWs8" id="6pzXh8fty1g" role="3cqZAp">
               <node concept="3cpWsn" id="6pzXh8fty1h" role="3cpWs9">
@@ -655,46 +695,6 @@
               </node>
             </node>
           </node>
-          <node concept="3uVAMA" id="6pzXh8ftxCE" role="1zxBo5">
-            <node concept="XOnhg" id="6pzXh8ftxCG" role="1zc67B">
-              <property role="3TUv4t" value="false" />
-              <property role="TrG5h" value="e" />
-              <node concept="nSUau" id="HzqgCR2R8u" role="1tU5fm">
-                <node concept="3uibUv" id="6pzXh8ftxCH" role="nSUat">
-                  <ref role="3uigEE" to="i4mf:~JsonProcessingException" resolve="JsonProcessingException" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="6pzXh8ftxCF" role="1zc67A">
-              <node concept="RRSsy" id="72Ne6Stc96M" role="3cqZAp">
-                <property role="RRSoG" value="gZ5fh_4/error" />
-                <node concept="37vLTw" id="72Ne6Stc96Q" role="RRSow">
-                  <ref role="3cqZAo" node="6pzXh8ftxCG" resolve="e" />
-                </node>
-                <node concept="Xl_RD" id="72Ne6Stc96O" role="RRSoy" />
-              </node>
-            </node>
-          </node>
-          <node concept="3uVAMA" id="6pzXh8ftxCI" role="1zxBo5">
-            <node concept="XOnhg" id="6pzXh8ftxCK" role="1zc67B">
-              <property role="3TUv4t" value="false" />
-              <property role="TrG5h" value="e" />
-              <node concept="nSUau" id="HzqgCR2R8A" role="1tU5fm">
-                <node concept="3uibUv" id="6pzXh8ftxCL" role="nSUat">
-                  <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="6pzXh8ftxCJ" role="1zc67A">
-              <node concept="RRSsy" id="72Ne6Stc9sA" role="3cqZAp">
-                <property role="RRSoG" value="gZ5fh_4/error" />
-                <node concept="37vLTw" id="72Ne6Stc9sE" role="RRSow">
-                  <ref role="3cqZAo" node="6pzXh8ftxCK" resolve="e" />
-                </node>
-                <node concept="Xl_RD" id="72Ne6Stc9sC" role="RRSoy" />
-              </node>
-            </node>
-          </node>
         </node>
         <node concept="3cpWs6" id="6pzXh8ftyxF" role="3cqZAp">
           <node concept="10Nm6u" id="6pzXh8ftyHs" role="3cqZAk" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.constraints.mps
index e187d9a33b3..3627bbee167 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.constraints.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps
index f0b35e51f19..a4813c366c3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps
@@ -13,7 +13,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -42,7 +42,7 @@
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
@@ -74,7 +74,7 @@
         <child id="1223387335081" name="query" index="3n$kyP" />
       </concept>
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -94,7 +94,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -119,7 +119,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -131,7 +131,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="7980428675268276156" name="jetbrains.mps.lang.editor.structure.TransformationMenuSection" flags="ng" index="1Qtc8_">
@@ -186,7 +186,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -226,7 +226,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps
index b2da4e1caec..313e659a8bf 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.textGen.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.textGen.mps
index d8fa769b5c8..3caa1ea5cbc 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.textGen.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.textGen.mps
@@ -40,7 +40,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -90,7 +90,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.typesystem.mps
index e5526d7ef0a..d6ed375f23e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.typesystem.mps
@@ -48,6 +48,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -90,7 +91,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -102,7 +103,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -152,7 +152,7 @@
                                   <node concept="17R0WA" id="1F5R5ewMIVU" role="3clFbG">
                                     <node concept="2OqwBi" id="1F5R5ewMIVV" role="3uHU7w">
                                       <node concept="37vLTw" id="1F5R5ewMIVW" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1F5R5ewMIW1" resolve="inner" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2rl" resolve="inner" />
                                       </node>
                                       <node concept="3TrcHB" id="1F5R5ewMIVX" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -160,7 +160,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="1F5R5ewMIVY" role="3uHU7B">
                                       <node concept="37vLTw" id="1F5R5ewMIVZ" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1F5R5ewMIW4" resolve="outer" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2rn" resolve="outer" />
                                       </node>
                                       <node concept="3TrcHB" id="1F5R5ewMIW0" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -169,9 +169,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1F5R5ewMIW1" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2rl" role="1bW2Oz">
                                 <property role="TrG5h" value="inner" />
-                                <node concept="2jxLKc" id="1F5R5ewMIW2" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2rm" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -181,9 +181,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1F5R5ewMIW4" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rn" role="1bW2Oz">
                   <property role="TrG5h" value="outer" />
-                  <node concept="2jxLKc" id="1F5R5ewMIW5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ro" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -206,13 +206,13 @@
                     <ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
                   </node>
                   <node concept="37vLTw" id="1F5R5ewMJPA" role="1urrMF">
-                    <ref role="3cqZAo" node="1F5R5ewMJCm" resolve="it" />
+                    <ref role="3cqZAo" node="2SR9xrsN2rp" resolve="it" />
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1F5R5ewMJCm" role="1bW2Oz">
+              <node concept="gl6BB" id="2SR9xrsN2rp" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1F5R5ewMJCn" role="1tU5fm" />
+                <node concept="2jxLKc" id="2SR9xrsN2rq" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps
index f48c7a74c04..e331b06beae 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:6492a138-3e52-4756-96b0-7e3c330fe78e(com.mbeddr.mpsutil.json.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -49,6 +49,7 @@
         <property id="1215865999894" name="mnemonic" index="ngHcd" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
         <property id="7458746815261976739" name="requiredAccess" index="2YLI8m" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <property id="1213273179528" name="description" index="1WHSii" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
@@ -76,7 +77,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -193,7 +194,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -216,7 +217,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -247,6 +248,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -254,7 +256,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -305,7 +307,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -325,7 +327,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
     </language>
   </registry>
@@ -334,6 +335,7 @@
     <property role="2uzpH1" value="Import JSON File(s)" />
     <property role="ngHcd" value="J" />
     <property role="2YLI8m" value="6u2MFnph2wS/none" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="ZvX1FxXY5Q" role="32lrUH">
       <property role="TrG5h" value="isJsonOrDir" />
       <node concept="3uibUv" id="ZvX1FxYhHy" role="3clF45">
@@ -557,15 +559,15 @@
                                         </node>
                                         <node concept="3BYIHo" id="mK9TSm42xU" role="2OqNvi">
                                           <node concept="37vLTw" id="mK9TSm42Oi" role="3BYIHq">
-                                            <ref role="3cqZAo" node="mK9TSm40WT" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2rr" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="mK9TSm40WT" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2rr" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="mK9TSm40WU" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2rs" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -766,6 +768,7 @@
     <property role="2uzpH1" value="Paste as JSON Content" />
     <property role="ngHcd" value="J" />
     <property role="1WHSii" value="Paste JSON object from clipboard" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="6V56CwaBDsk" role="32lrUH">
       <property role="TrG5h" value="getStringFromClipboard" />
       <node concept="3Tm1VV" id="6V56CwaBDsi" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.mpl
index 717bd66a786..614c5d6a2e0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1338ba73-5059-479b-a929-de86597a62b8(com.mbeddr.mpsutil.jung.pluginSolution)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/behavior.mps
index 83115dd162d..2f23088e298 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/behavior.mps
@@ -66,7 +66,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -185,7 +185,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -214,7 +214,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
@@ -225,6 +225,7 @@
       <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -245,7 +246,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -278,7 +279,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1324,7 +1324,7 @@
                       <node concept="Xjq3P" id="1mVSOo2R3MM" role="3uHU7w" />
                       <node concept="2OqwBi" id="1mVSOo2R3MN" role="3uHU7B">
                         <node concept="37vLTw" id="1mVSOo2R3MO" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1mVSOo2R3MQ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2rt" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1mVSOo2R3MP" role="2OqNvi">
                           <ref role="37wK5l" node="5yCuRHcbPTJ" resolve="from" />
@@ -1333,9 +1333,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1mVSOo2R3MQ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rt" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1mVSOo2R3MR" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ru" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1388,7 +1388,7 @@
                   <node concept="3clFbF" id="2RWKP1E_$To" role="3cqZAp">
                     <node concept="2OqwBi" id="2RWKP1E_$Wg" role="3clFbG">
                       <node concept="37vLTw" id="2RWKP1E_$Tn" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2RWKP1E_$O2" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2rv" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2RWKP1E__eb" role="2OqNvi">
                         <ref role="37wK5l" node="5yCuRHcbQeE" resolve="to" />
@@ -1396,9 +1396,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2RWKP1E_$O2" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rv" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2RWKP1E_$O3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2rw" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1434,7 +1434,7 @@
                       <node concept="Xjq3P" id="1mVSOo2RbK9" role="3uHU7w" />
                       <node concept="2OqwBi" id="1mVSOo2RbKa" role="3uHU7B">
                         <node concept="37vLTw" id="1mVSOo2RbKb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1mVSOo2RbKd" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2rx" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1mVSOo2RbKc" role="2OqNvi">
                           <ref role="37wK5l" node="5yCuRHcbQeE" resolve="to" />
@@ -1443,9 +1443,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1mVSOo2RbKd" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rx" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1mVSOo2RbKe" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ry" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1482,7 +1482,7 @@
                         <node concept="Xjq3P" id="1mVSOo2Rndr" role="3uHU7w" />
                         <node concept="2OqwBi" id="1mVSOo2RmH7" role="3uHU7B">
                           <node concept="37vLTw" id="1mVSOo2RmDE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1mVSOo2Rmml" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2rz" resolve="it" />
                           </node>
                           <node concept="liA8E" id="1mVSOo2RmZw" role="2OqNvi">
                             <ref role="37wK5l" node="5yCuRHcbPTJ" resolve="from" />
@@ -1492,7 +1492,7 @@
                       <node concept="3clFbC" id="1mVSOo2Rmmg" role="3uHU7B">
                         <node concept="2OqwBi" id="1mVSOo2Rmmi" role="3uHU7B">
                           <node concept="37vLTw" id="1mVSOo2Rmmj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1mVSOo2Rmml" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2rz" resolve="it" />
                           </node>
                           <node concept="liA8E" id="1mVSOo2Rmmk" role="2OqNvi">
                             <ref role="37wK5l" node="5yCuRHcbQeE" resolve="to" />
@@ -1503,9 +1503,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1mVSOo2Rmml" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1mVSOo2Rmmm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2r$" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1723,7 +1723,7 @@
                   <node concept="3clFbF" id="2RWKP1E_phG" role="3cqZAp">
                     <node concept="2OqwBi" id="2RWKP1E_phH" role="3clFbG">
                       <node concept="37vLTw" id="2RWKP1E_phJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2RWKP1E_phN" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2r_" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2RWKP1E_phL" role="2OqNvi">
                         <ref role="37wK5l" node="1pXMZRGv4sz" resolve="collectReachableNodes" />
@@ -1734,9 +1734,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2RWKP1E_phN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2r_" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2RWKP1E_phO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2rA" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1793,7 +1793,7 @@
                     <node concept="2OqwBi" id="1pXMZRGvBPK" role="3clFbG">
                       <node concept="2OqwBi" id="1pXMZRGvBw6" role="2Oq$k0">
                         <node concept="37vLTw" id="1pXMZRGvBtE" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1pXMZRGvBpA" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2rB" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1pXMZRGvBKi" role="2OqNvi">
                           <ref role="37wK5l" node="5yCuRHcbQeE" resolve="to" />
@@ -1808,9 +1808,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1pXMZRGvBpA" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1pXMZRGvBpB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2rC" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/structure.mps
index 507085a1dcf..ebbb2cfa0e7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/languageModels/structure.mps
@@ -14,7 +14,7 @@
       <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/com.mbeddr.mpsutil.jung.pluginSolution.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/com.mbeddr.mpsutil.jung.pluginSolution.msd
index 1d0fb38be4c..82b0b5ff637 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/com.mbeddr.mpsutil.jung.pluginSolution.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/com.mbeddr.mpsutil.jung.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.jung.pluginSolution" uuid="1338ba73-5059-479b-a929-de86597a62b8" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.jung.pluginSolution" uuid="1338ba73-5059-479b-a929-de86597a62b8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -26,27 +26,24 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/collections-generic-4.01.jar" />
+      <library location="${module}/lib/colt-1.2.0.jar" />
+      <library location="${module}/lib/concurrent-1.3.4.jar" />
+      <library location="${module}/lib/j3d-core-1.3.1.jar" />
+      <library location="${module}/lib/jung-3d-2.0.1.jar" />
+      <library location="${module}/lib/jung-3d-demos-2.0.1.jar" />
+      <library location="${module}/lib/jung-algorithms-2.0.1.jar" />
+      <library location="${module}/lib/jung-api-2.0.1.jar" />
+      <library location="${module}/lib/jung-graph-impl-2.0.1.jar" />
+      <library location="${module}/lib/jung-io-2.0.1.jar" />
+      <library location="${module}/lib/jung-jai-2.0.1.jar" />
+      <library location="${module}/lib/jung-jai-samples-2.0.1.jar" />
+      <library location="${module}/lib/jung-samples-2.0.1.jar" />
+      <library location="${module}/lib/jung-visualization-2.0.1.jar" />
+      <library location="${module}/lib/vecmath-1.3.1.jar" />
+      <library location="${module}/lib/wstx-asl-3.2.6.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/collections-generic-4.01.jar" />
-    <stubModelEntry path="${module}/lib/colt-1.2.0.jar" />
-    <stubModelEntry path="${module}/lib/concurrent-1.3.4.jar" />
-    <stubModelEntry path="${module}/lib/j3d-core-1.3.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-3d-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-3d-demos-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-algorithms-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-api-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-graph-impl-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-io-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-jai-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-jai-samples-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-samples-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jung-visualization-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/vecmath-1.3.1.jar" />
-    <stubModelEntry path="${module}/lib/wstx-asl-3.2.6.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
@@ -61,14 +58,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps
index dc165725d9e..48498689f00 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps
@@ -2,10 +2,10 @@
 <model ref="r:a4d2816e-eecf-46de-9a08-59eca64b12fc(com.mbeddr.mpsutil.jung.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -67,6 +67,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -105,7 +106,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -117,7 +118,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -156,7 +157,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -304,7 +305,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -334,7 +335,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -378,6 +379,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -396,7 +398,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -427,7 +429,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -471,7 +473,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
@@ -7019,15 +7020,15 @@
                               <node concept="2XshWL" id="595ZbraE$83" role="2OqNvi">
                                 <ref role="2WH_rO" node="595ZbraDps4" resolve="collapseNode" />
                                 <node concept="37vLTw" id="595ZbraEAgq" role="2XxRq1">
-                                  <ref role="3cqZAo" node="595ZbraEA2p" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Da" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="595ZbraEA2p" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Da" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="595ZbraEA2q" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Db" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -7875,7 +7876,7 @@
                                           <node concept="liA8E" id="78j9QLkeloM" role="2OqNvi">
                                             <ref role="37wK5l" to="2kct:~PickedState.pick(java.lang.Object,boolean)" resolve="pick" />
                                             <node concept="37vLTw" id="78j9QLkeloN" role="37wK5m">
-                                              <ref role="3cqZAo" node="78j9QLkelpj" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2Dc" resolve="it" />
                                             </node>
                                             <node concept="3clFbT" id="78j9QLkeloO" role="37wK5m">
                                               <property role="3clFbU" value="true" />
@@ -7894,7 +7895,7 @@
                                                 <ref role="37wK5l" to="2kct:~PickedState.pick(java.lang.Object,boolean)" resolve="pick" />
                                                 <node concept="2OqwBi" id="78j9QLkeloV" role="37wK5m">
                                                   <node concept="37vLTw" id="78j9QLkeloW" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="78j9QLkelpj" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2Dc" resolve="it" />
                                                   </node>
                                                   <node concept="liA8E" id="78j9QLkeloX" role="2OqNvi">
                                                     <ref role="37wK5l" to="ln2k:5yCuRHcbQeE" resolve="to" />
@@ -7928,7 +7929,7 @@
                                               <ref role="37wK5l" node="78j9QLkeloh" resolve="highlight" />
                                               <node concept="2OqwBi" id="78j9QLkelp8" role="37wK5m">
                                                 <node concept="37vLTw" id="78j9QLkelp9" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="78j9QLkelpj" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2Dc" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="78j9QLkelpa" role="2OqNvi">
                                                   <ref role="37wK5l" to="ln2k:5yCuRHcbQeE" resolve="to" />
@@ -7959,9 +7960,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="78j9QLkelpj" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2Dc" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="78j9QLkelpk" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2Dd" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -8006,7 +8007,7 @@
                                           <node concept="liA8E" id="78j9QLkelpC" role="2OqNvi">
                                             <ref role="37wK5l" to="2kct:~PickedState.pick(java.lang.Object,boolean)" resolve="pick" />
                                             <node concept="37vLTw" id="78j9QLkelpD" role="37wK5m">
-                                              <ref role="3cqZAo" node="78j9QLkelq9" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2De" resolve="it" />
                                             </node>
                                             <node concept="3clFbT" id="78j9QLkelpE" role="37wK5m">
                                               <property role="3clFbU" value="true" />
@@ -8025,7 +8026,7 @@
                                                 <ref role="37wK5l" to="2kct:~PickedState.pick(java.lang.Object,boolean)" resolve="pick" />
                                                 <node concept="2OqwBi" id="78j9QLkelpL" role="37wK5m">
                                                   <node concept="37vLTw" id="78j9QLkelpM" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="78j9QLkelq9" resolve="it" />
+                                                    <ref role="3cqZAo" node="2SR9xrsN2De" resolve="it" />
                                                   </node>
                                                   <node concept="liA8E" id="78j9QLkelpN" role="2OqNvi">
                                                     <ref role="37wK5l" to="ln2k:5yCuRHcbPTJ" resolve="from" />
@@ -8059,7 +8060,7 @@
                                               <ref role="37wK5l" node="78j9QLkeloh" resolve="highlight" />
                                               <node concept="2OqwBi" id="78j9QLkelpY" role="37wK5m">
                                                 <node concept="37vLTw" id="78j9QLkelpZ" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="78j9QLkelq9" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2De" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="78j9QLkelq0" role="2OqNvi">
                                                   <ref role="37wK5l" to="ln2k:5yCuRHcbPTJ" resolve="from" />
@@ -8092,9 +8093,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="78j9QLkelq9" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2De" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="78j9QLkelqa" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2Df" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -9283,6 +9284,7 @@
   <node concept="sE7Ow" id="4mGNV$raQvF">
     <property role="TrG5h" value="OpenGraphViewer" />
     <property role="2uzpH1" value="Show Graph Viewer" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="7NyyyjNHi27" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -9412,7 +9414,7 @@
                           <node concept="3clFbF" id="1FqEKJFj37b" role="3cqZAp">
                             <node concept="2OqwBi" id="1FqEKJFj37c" role="3clFbG">
                               <node concept="37vLTw" id="1FqEKJFj37d" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1FqEKJFj37g" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Dg" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="1FqEKJFj37e" role="2OqNvi">
                                 <node concept="chp4Y" id="1FqEKJFj37f" role="cj9EA">
@@ -9422,9 +9424,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1FqEKJFj37g" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Dg" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1FqEKJFj37h" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Dh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -9508,7 +9510,7 @@
                           <node concept="2OqwBi" id="1FqEKJFs4iQ" role="3uHU7B">
                             <node concept="1PxgMI" id="1FqEKJFs3LQ" role="2Oq$k0">
                               <node concept="37vLTw" id="1FqEKJFs38F" role="1m5AlR">
-                                <ref role="3cqZAo" node="1FqEKJFiWY0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Di" resolve="it" />
                               </node>
                               <node concept="chp4Y" id="5RIakkDJMOC" role="3oSUPX">
                                 <ref role="cht4Q" to="10jo:5yCuRHcawFz" resolve="IJGraphProvider" />
@@ -9521,7 +9523,7 @@
                         </node>
                         <node concept="2OqwBi" id="1FqEKJFiWXW" role="3uHU7B">
                           <node concept="37vLTw" id="1FqEKJFiWXX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1FqEKJFiWY0" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Di" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="1FqEKJFiWXY" role="2OqNvi">
                             <node concept="chp4Y" id="1FqEKJFiWXZ" role="cj9EA">
@@ -9532,9 +9534,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1FqEKJFiWY0" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Di" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1FqEKJFiWY1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Dj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/com.mbeddr.mpsutil.lang.plugin.extensions.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/com.mbeddr.mpsutil.lang.plugin.extensions.mpl
index ddec7e51a3e..e14ced7ea72 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/com.mbeddr.mpsutil.lang.plugin.extensions.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/com.mbeddr.mpsutil.lang.plugin.extensions.mpl
@@ -46,7 +46,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -106,7 +106,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -117,7 +116,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -135,7 +134,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/com/mbeddr/mpsutil/lang/plugin/extensions/generator/model.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/com/mbeddr/mpsutil/lang/plugin/extensions/generator/model.mps
index 93c1629b0d9..fabc34169f7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/com/mbeddr/mpsutil/lang/plugin/extensions/generator/model.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/com/mbeddr/mpsutil/lang/plugin/extensions/generator/model.mps
@@ -51,7 +51,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -66,7 +66,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -97,7 +97,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/main@generator.mps
index 98c49095be0..11c44fbb2ef 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/generator/template/main@generator.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
@@ -46,7 +46,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -125,7 +125,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -146,7 +146,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -178,7 +178,7 @@
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -227,6 +227,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -307,7 +308,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -323,7 +324,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -636,7 +636,7 @@
                         <node concept="2OqwBi" id="2BR5zyhGGDN" role="3clFbG">
                           <node concept="2OqwBi" id="2BR5zyhGGDO" role="2Oq$k0">
                             <node concept="37vLTw" id="2BR5zyhGGDP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2BR5zyhGGDT" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2rE" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2BR5zyhGGDQ" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -651,9 +651,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2BR5zyhGGDT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2rE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2BR5zyhGGDU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2rF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1045,7 +1045,7 @@
                       <node concept="2OqwBi" id="2BR5zyhIHt2" role="3clFbG">
                         <node concept="2OqwBi" id="2BR5zyhIHt3" role="2Oq$k0">
                           <node concept="37vLTw" id="2BR5zyhIHt4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2BR5zyhIHt8" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2rG" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2BR5zyhIHt5" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1060,9 +1060,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2BR5zyhIHt8" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2rG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2BR5zyhIHt9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2rH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1091,7 +1091,7 @@
                             <node concept="2OqwBi" id="2BR5zyhIWI1" role="2Oq$k0">
                               <node concept="2OqwBi" id="2BR5zyhIWI2" role="2Oq$k0">
                                 <node concept="37vLTw" id="2BR5zyhIWI3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2BR5zyhIHGJ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2rW" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="2BR5zyhIWI4" role="2OqNvi">
                                   <ref role="37wK5l" to="tpek:i2fhZ_m" resolve="getBody" />
@@ -1118,7 +1118,7 @@
                                           <node concept="1PxgMI" id="2BR5zyhIWIg" role="2Oq$k0">
                                             <node concept="2OqwBi" id="2BR5zyhIWIh" role="1m5AlR">
                                               <node concept="37vLTw" id="2BR5zyhIWIi" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2BR5zyhIWIu" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2rI" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="2BR5zyhIWIj" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
@@ -1146,7 +1146,7 @@
                                     <node concept="2OqwBi" id="2BR5zyhIWIo" role="3uHU7B">
                                       <node concept="2OqwBi" id="2BR5zyhIWIp" role="2Oq$k0">
                                         <node concept="37vLTw" id="2BR5zyhIWIq" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2BR5zyhIWIu" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2rI" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="2BR5zyhIWIr" role="2OqNvi">
                                           <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
@@ -1161,9 +1161,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2BR5zyhIWIu" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2rI" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2BR5zyhIWIv" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2rJ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1175,7 +1175,7 @@
                                 <node concept="1PxgMI" id="2BR5zyhIWI$" role="3clFbG">
                                   <node concept="2OqwBi" id="2BR5zyhIWI_" role="1m5AlR">
                                     <node concept="37vLTw" id="2BR5zyhIWIA" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2BR5zyhIWIC" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2rK" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="2BR5zyhIWIB" role="2OqNvi">
                                       <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
@@ -1187,9 +1187,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2BR5zyhIWIC" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2rK" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2BR5zyhIWID" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2rL" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1216,7 +1216,7 @@
                                   <node concept="2OqwBi" id="2BR5zyhJnCi" role="3uHU7B">
                                     <node concept="2OqwBi" id="2BR5zyhJnCj" role="2Oq$k0">
                                       <node concept="37vLTw" id="2BR5zyhJnCk" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2BR5zyhJnCo" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2rM" resolve="it" />
                                       </node>
                                       <node concept="3Tsc0h" id="2BR5zyhJnCl" role="2OqNvi">
                                         <ref role="3TtcxE" to="tpee:fz7wK6I" resolve="actualArgument" />
@@ -1230,9 +1230,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2BR5zyhJnCo" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2rM" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2BR5zyhJnCp" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2rN" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1262,7 +1262,7 @@
                                   <node concept="2OqwBi" id="2BR5zyhNHEP" role="3uHU7B">
                                     <node concept="2OqwBi" id="2BR5zyhNHEQ" role="2Oq$k0">
                                       <node concept="37vLTw" id="2BR5zyhNHER" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2BR5zyhNHEU" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2rO" resolve="it" />
                                       </node>
                                       <node concept="3Tsc0h" id="2BR5zyhNHES" role="2OqNvi">
                                         <ref role="3TtcxE" to="tpee:fz7wK6I" resolve="actualArgument" />
@@ -1273,9 +1273,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2BR5zyhNHEU" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2rO" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2BR5zyhNHEV" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2rP" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1307,7 +1307,7 @@
                                           <node concept="2OqwBi" id="2BR5zyhUjGl" role="3clFbG">
                                             <node concept="2OqwBi" id="2BR5zyhUidR" role="2Oq$k0">
                                               <node concept="37vLTw" id="2BR5zyhUnk6" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2BR5zyhKdUE" resolve="oldCall" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2rS" resolve="oldCall" />
                                               </node>
                                               <node concept="3Tsc0h" id="2BR5zyhUiWq" role="2OqNvi">
                                                 <ref role="3TtcxE" to="tpee:fz7wK6I" resolve="actualArgument" />
@@ -1321,12 +1321,12 @@
                                                       <ref role="37wK5l" to="grj5:2BR5zyhSnGA" resolve="isEqualExpressions" />
                                                       <ref role="1Pybhc" to="grj5:2BR5zyhSnFP" resolve="GeneratorUtil" />
                                                       <node concept="37vLTw" id="2BR5zyhUsG9" role="37wK5m">
-                                                        <ref role="3cqZAo" node="2BR5zyhUpMc" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN2rQ" resolve="it" />
                                                       </node>
                                                       <node concept="2OqwBi" id="2BR5zyhUwdi" role="37wK5m">
                                                         <node concept="2OqwBi" id="2BR5zyhUu_k" role="2Oq$k0">
                                                           <node concept="37vLTw" id="2BR5zyhUue7" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="2BR5zyhJsCR" resolve="newCall" />
+                                                            <ref role="3cqZAo" node="2SR9xrsN2rU" resolve="newCall" />
                                                           </node>
                                                           <node concept="3Tsc0h" id="2BR5zyhUvcI" role="2OqNvi">
                                                             <ref role="3TtcxE" to="tpee:fz7wK6I" resolve="actualArgument" />
@@ -1335,7 +1335,7 @@
                                                         <node concept="34jXtK" id="2BR5zyhUy6M" role="2OqNvi">
                                                           <node concept="2OqwBi" id="2BR5zyhUyXt" role="25WWJ7">
                                                             <node concept="37vLTw" id="2BR5zyhUyBr" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="2BR5zyhUpMc" resolve="it" />
+                                                              <ref role="3cqZAo" node="2SR9xrsN2rQ" resolve="it" />
                                                             </node>
                                                             <node concept="2bSWHS" id="2BR5zyhUzyS" role="2OqNvi" />
                                                           </node>
@@ -1344,18 +1344,18 @@
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="Rh6nW" id="2BR5zyhUpMc" role="1bW2Oz">
+                                                <node concept="gl6BB" id="2SR9xrsN2rQ" role="1bW2Oz">
                                                   <property role="TrG5h" value="it" />
-                                                  <node concept="2jxLKc" id="2BR5zyhUpMd" role="1tU5fm" />
+                                                  <node concept="2jxLKc" id="2SR9xrsN2rR" role="1tU5fm" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2BR5zyhKdUE" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2rS" role="1bW2Oz">
                                         <property role="TrG5h" value="oldCall" />
-                                        <node concept="2jxLKc" id="2BR5zyhKdUF" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2rT" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1390,18 +1390,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2BR5zyhJsCR" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2rU" role="1bW2Oz">
                             <property role="TrG5h" value="newCall" />
-                            <node concept="2jxLKc" id="2BR5zyhJsCS" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2rV" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2BR5zyhIHGJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2BR5zyhIHGK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2rX" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps
index 25069a875a2..63a33a7c281 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="true" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
@@ -15,7 +15,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/editor.mps
index c4aed4416f6..68b5da58bc5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/editor.mps
@@ -35,7 +35,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -54,7 +54,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps
index bec684127c5..1ac77510143 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps
@@ -68,7 +68,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/typesystem.mps
index 48f34aab0ab..382b9d6f05f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/typesystem.mps
@@ -60,7 +60,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.mpl
index 22021f2e75a..a993016aca5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -25,7 +24,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.behavior.mps
index 78c1b7d5562..e18e8958de6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.behavior.mps
@@ -42,7 +42,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -56,7 +56,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.editor.mps
index 3a1854db65d..5babd8c0448 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.editor.mps
@@ -65,7 +65,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -89,7 +89,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -163,7 +163,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -176,7 +176,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -186,6 +186,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -211,7 +212,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -223,7 +224,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
     </language>
   </registry>
@@ -680,7 +680,7 @@
                             <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                           </node>
                           <node concept="37vLTw" id="3lcj7hzwkUf" role="1m5AlR">
-                            <ref role="3cqZAo" node="3lcj7hzv_rt" resolve="child" />
+                            <ref role="3cqZAo" node="2SR9xrsN2rY" resolve="child" />
                           </node>
                         </node>
                         <node concept="3TrcHB" id="3lcj7hzwndH" role="2OqNvi">
@@ -727,7 +727,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="3lcj7hzvYXG" role="37wK5m">
-                            <ref role="3cqZAo" node="3lcj7hzv_rt" resolve="child" />
+                            <ref role="3cqZAo" node="2SR9xrsN2rY" resolve="child" />
                           </node>
                         </node>
                       </node>
@@ -758,7 +758,7 @@
                           <ref role="1PxDUh" to="5ueo:~StyleAttributes" resolve="StyleAttributes" />
                         </node>
                         <node concept="37vLTw" id="3lcj7hzw2YA" role="37wK5m">
-                          <ref role="3cqZAo" node="3lcj7hzv_rt" resolve="child" />
+                          <ref role="3cqZAo" node="2SR9xrsN2rY" resolve="child" />
                         </node>
                       </node>
                     </node>
@@ -777,9 +777,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3lcj7hzv_rt" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2rY" role="1bW2Oz">
                   <property role="TrG5h" value="child" />
-                  <node concept="2jxLKc" id="3lcj7hzv_ru" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2rZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.structure.mps
index 58b3653f494..5ea4431e097 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.structure.mps
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
index 6836d446377..7f673ec63c4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index f34bd1cb015..268c8d42ff7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -83,7 +83,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,7 +94,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -105,6 +105,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -153,7 +154,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -181,7 +182,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -272,16 +272,16 @@
                         <node concept="BsUDl" id="jksL7exMBY" role="25WWJ7">
                           <ref role="37wK5l" node="5zdrv$9zA2z" resolve="findLogicalChildrenIn" />
                           <node concept="37vLTw" id="jksL7exMBZ" role="37wK5m">
-                            <ref role="3cqZAo" node="5zdrv$9z3Il" resolve="model" />
+                            <ref role="3cqZAo" node="2SR9xrsN2s1" resolve="model" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5zdrv$9z3Il" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2s1" role="1bW2Oz">
                   <property role="TrG5h" value="model" />
-                  <node concept="2jxLKc" id="5zdrv$9z3Im" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2s2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -485,7 +485,7 @@
                         <node concept="13iPFW" id="5zdrv$9zA2o" role="3uHU7w" />
                         <node concept="2OqwBi" id="5zdrv$9zA2p" role="3uHU7B">
                           <node concept="37vLTw" id="5zdrv$9zA2q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5zdrv$9zA2s" resolve="child" />
+                            <ref role="3cqZAo" node="2SR9xrsN2s3" resolve="child" />
                           </node>
                           <node concept="2qgKlT" id="5SdnHczgZrP" role="2OqNvi">
                             <ref role="37wK5l" node="7c93VeVMBwo" resolve="getOwner" />
@@ -494,9 +494,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5zdrv$9zA2s" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2s3" role="1bW2Oz">
                     <property role="TrG5h" value="child" />
-                    <node concept="2jxLKc" id="5zdrv$9zA2t" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2s4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.structure.mps
index 0467c716d11..4a06fd3bcab 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.structure.mps
@@ -14,7 +14,7 @@
       <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/com.mbeddr.mpsutil.mappingLabels.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/com.mbeddr.mpsutil.mappingLabels.mpl
index 2359d476021..1c2e68f224d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/com.mbeddr.mpsutil.mappingLabels.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/com.mbeddr.mpsutil.mappingLabels.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/languageModels/intentions.mps
index 09449a32dcf..ec315778b04 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.mappingLabels/languageModels/intentions.mps
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,7 +112,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -122,6 +122,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -229,7 +230,7 @@
       <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -253,7 +254,6 @@
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -819,7 +819,7 @@
                       <node concept="2OqwBi" id="XyAj1BppBH" role="3clFbG">
                         <node concept="2OqwBi" id="XyAj1BppBI" role="2Oq$k0">
                           <node concept="37vLTw" id="XyAj1BppBJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="XyAj1BppBN" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2s6" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="XyAj1BppBK" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -834,9 +834,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="XyAj1BppBN" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2s6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="XyAj1BppBO" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2s7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1991,7 +1991,7 @@
                       <node concept="2OqwBi" id="2dCF6Fx9lpo" role="3clFbG">
                         <node concept="2OqwBi" id="2dCF6Fx9lpp" role="2Oq$k0">
                           <node concept="37vLTw" id="2dCF6Fx9lpq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2dCF6Fx9lpu" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2s8" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2dCF6Fx9lpr" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2006,9 +2006,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2dCF6Fx9lpu" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2s8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2dCF6Fx9lpv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2s9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2672,7 +2672,7 @@
                       <node concept="2OqwBi" id="7ZfoUOqSjyl" role="3clFbG">
                         <node concept="2OqwBi" id="7ZfoUOqSjym" role="2Oq$k0">
                           <node concept="37vLTw" id="7ZfoUOqSjyn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7ZfoUOqSjyr" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2sa" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="7ZfoUOqSjyo" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2687,9 +2687,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7ZfoUOqSjyr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2sa" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7ZfoUOqSjys" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2sb" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/com.mbeddr.mpsutil.margincell.editor.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/com.mbeddr.mpsutil.margincell.editor.mpl
index c904d701585..912804e9c01 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/com.mbeddr.mpsutil.margincell.editor.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/com.mbeddr.mpsutil.margincell.editor.mpl
@@ -37,7 +37,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -100,7 +100,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -111,7 +110,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/generator/template/main@generator.mps
index d9f80a10aba..be0c3410192 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/generator/template/main@generator.mps
@@ -86,7 +86,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,7 +98,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -117,7 +117,7 @@
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj">
         <reference id="1200916687663" name="labelDeclaration" index="2sdACS" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -174,7 +174,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/editor.mps
index ae98b75ffab..91173fc166d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/editor.mps
@@ -37,7 +37,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -57,7 +57,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -103,7 +103,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -114,7 +114,7 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/structure.mps
index ed59d1a18c4..21e3612a10c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/structure.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/typesystem.mps
index 6c53bb72577..81f7ea6ac85 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.editor/languageModels/typesystem.mps
@@ -35,7 +35,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,7 +79,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/com.mbeddr.mpsutil.margincell.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/com.mbeddr.mpsutil.margincell.sandbox.mpl
index 9c8095a3b4b..877e644facc 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/com.mbeddr.mpsutil.margincell.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/com.mbeddr.mpsutil.margincell.sandbox.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">92f195b6-a209-4804-ad65-f5248ecd5873(com.mbeddr.mpsutil.margincell)</dependency>
   </dependencies>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/languageModels/structure.mps
index 2a5c8700845..8c22105bb3f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell.sandbox/languageModels/structure.mps
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/com.mbeddr.mpsutil.margincell.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/com.mbeddr.mpsutil.margincell.mpl
index 10277d4090d..bdf7782dcf4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/com.mbeddr.mpsutil.margincell.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/com.mbeddr.mpsutil.margincell.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/behavior.mps
index b4076309a29..a93fab762d6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/behavior.mps
@@ -90,7 +90,7 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,7 +102,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -122,7 +122,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/structure.mps
index f79495b224c..e9fc83baf07 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/structure.mps
@@ -28,7 +28,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/typesystem.mps
index f4af71b6dfa..0b6dd393516 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell/languageModels/typesystem.mps
@@ -69,7 +69,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl
index 0e18042f9e7..2e6424a495b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl
@@ -38,7 +38,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -113,7 +113,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -128,7 +127,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/generator/template/main@generator.mps
index d9cc847883d..037904bbd8b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/generator/template/main@generator.mps
@@ -79,7 +79,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -91,7 +91,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -175,7 +175,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/behavior.mps
index 04ee6054e4b..a11a978c25f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/behavior.mps
@@ -81,7 +81,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -92,7 +92,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -103,6 +103,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -141,7 +142,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -149,7 +150,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
@@ -397,7 +397,7 @@
                           <node concept="3clFbF" id="2UbT3C4jUgT" role="3cqZAp">
                             <node concept="2OqwBi" id="2UbT3C4jUgU" role="3clFbG">
                               <node concept="37vLTw" id="2UbT3C4jUgV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2UbT3C4jUgX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2sf" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="2UbT3C4jUgW" role="2OqNvi">
                                 <ref role="37wK5l" to="xedy:2UbT3C4ekKT" resolve="getConversionFlagSymbol" />
@@ -405,9 +405,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2UbT3C4jUgX" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2sf" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2UbT3C4jUgY" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2sg" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/constraints.mps
index 98b4cae876a..adebff4ee73 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/constraints.mps
@@ -59,7 +59,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,6 +97,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -131,7 +132,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -139,7 +140,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -323,15 +323,15 @@
                       <node concept="3clFbF" id="2lop6rSgaxV" role="3cqZAp">
                         <node concept="2OqwBi" id="2lop6rSgaxW" role="3clFbG">
                           <node concept="37vLTw" id="2lop6rSgaxX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2lop6rSgaxZ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2sh" resolve="it" />
                           </node>
                           <node concept="FGMqu" id="2lop6rSgaxY" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2lop6rSgaxZ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2sh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2lop6rSgay0" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2si" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/editor.mps
index fe006457a1e..634bc3d94cd 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/editor.mps
@@ -51,7 +51,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -77,7 +77,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -119,7 +119,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/intentions.mps
index e9d815cb39e..74cc81ef3c5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/intentions.mps
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,7 +97,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/structure.mps
index 498f3dfebc2..5d67df4a726 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/typesystem.mps
index a16f2763696..38d5fabd533 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/languageModels/typesystem.mps
@@ -93,7 +93,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -133,6 +133,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -222,7 +223,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -254,7 +255,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -367,7 +367,7 @@
                     <node concept="3clFbF" id="6d0zIQxb$k9" role="3cqZAp">
                       <node concept="2OqwBi" id="6d0zIQxb$ka" role="3clFbG">
                         <node concept="37vLTw" id="6d0zIQxb$kb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6d0zIQxb$kd" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2sj" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6d0zIQxb$kc" role="2OqNvi">
                           <ref role="3TsBF5" to="tnjx:7Ssz$kYeJGc" resolve="argumentIndex" />
@@ -375,9 +375,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6d0zIQxb$kd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2sj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6d0zIQxb$ke" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2sk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -630,7 +630,7 @@
                     <node concept="3clFbF" id="7Ssz$kYvPWP" role="3cqZAp">
                       <node concept="2OqwBi" id="7Ssz$kYvPWQ" role="3clFbG">
                         <node concept="37vLTw" id="7Ssz$kYvPWR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7Ssz$kYvPWT" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2sl" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="7Ssz$kYvPWS" role="2OqNvi">
                           <ref role="3TsBF5" to="tnjx:7Ssz$kYeJGc" resolve="argumentIndex" />
@@ -638,9 +638,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7Ssz$kYvPWT" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2sl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7Ssz$kYvPWU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2sm" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="7Ssz$kYvPWV" role="2S7zOq">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/com.mbeddr.mpsutil.multilingual.common.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/com.mbeddr.mpsutil.multilingual.common.mpl
index bb59fb65f89..5a4865e9103 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/com.mbeddr.mpsutil.multilingual.common.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/com.mbeddr.mpsutil.multilingual.common.mpl
@@ -35,7 +35,7 @@
         <language slang="l:23f985f2-965f-4af1-aee8-a32677429514:com.mbeddr.mpsutil.multilingual.common" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -66,7 +66,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="true">eedc5a6f-c2e8-4009-a7ab-5fc307bf77ec(com.mbeddr.mpsutil.multilingual.common.runtime)</dependency>
@@ -80,7 +79,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/generator/template/main@generator.mps
index ab922ad3b81..9fffa07123b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/generator/template/main@generator.mps
@@ -56,7 +56,7 @@
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -67,7 +67,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -111,7 +111,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageAccessories/com/mbeddr/mpsutil/multilingual/common/languageRegistry.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageAccessories/com/mbeddr/mpsutil/multilingual/common/languageRegistry.mps
index 9789c536d91..53c7cc5fac0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageAccessories/com/mbeddr/mpsutil/multilingual/common/languageRegistry.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageAccessories/com/mbeddr/mpsutil/multilingual/common/languageRegistry.mps
@@ -9,7 +9,7 @@
   <imports />
   <registry>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/behavior.mps
index 1bdd031b2a5..3d07f0c12a0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/behavior.mps
@@ -95,7 +95,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -111,7 +111,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -149,7 +149,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/constraints.mps
index 12d5f8e103f..8610df4fb6f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/constraints.mps
@@ -42,7 +42,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/editor.mps
index 6fa1d70d4ea..a00c246ba38 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/editor.mps
@@ -43,7 +43,7 @@
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1220974635399" name="jetbrains.mps.lang.editor.structure.QueryFunction_FontStyle" flags="in" index="17KAyr" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -60,7 +60,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -100,7 +100,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -133,7 +133,7 @@
       <concept id="1397920687864683158" name="de.slisson.mps.tables.structure.Table" flags="ng" index="2rfBfz">
         <child id="1397920687864865354" name="cells" index="2rf8GZ" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/intentions.mps
index 5f69d7281d8..fd5b2e2a75b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/intentions.mps
@@ -64,7 +64,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,7 +113,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/structure.mps
index cf452d0a303..0b76c0ce497 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/structure.mps
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/typesystem.mps
index 05d30e53229..5fa363190f9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.common/languageModels/typesystem.mps
@@ -60,7 +60,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl
index 7a0cd182abc..1e5c0dcf28a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">23f985f2-965f-4af1-aee8-a32677429514(com.mbeddr.mpsutil.multilingual.common)</dependency>
     <dependency reexport="true">c038e2c4-0a5f-47e2-a3e8-327c1084f6a1(com.mbeddr.mpsutil.multilingual.concept.runtime)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/behavior.mps
index a680b3cd83d..11fea69579b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/behavior.mps
@@ -97,7 +97,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -106,7 +106,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -136,7 +136,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/constraints.mps
index 705ebf4c9c8..35e813f554a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/constraints.mps
@@ -60,7 +60,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/editor.mps
index 44b5e16658c..f67a79397f8 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/editor.mps
@@ -61,7 +61,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -85,7 +85,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -119,7 +119,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -147,7 +147,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/intentions.mps
index 2761c7c51d2..685eb1e6795 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/intentions.mps
@@ -39,7 +39,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/structure.mps
index b16243d256d..68e0f022ce5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/languageModels/structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/com.mbeddr.mpsutil.multilingual.editor.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/com.mbeddr.mpsutil.multilingual.editor.mpl
index 061ca63ea8a..5c403e54ace 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/com.mbeddr.mpsutil.multilingual.editor.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/com.mbeddr.mpsutil.multilingual.editor.mpl
@@ -36,7 +36,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -111,7 +111,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
@@ -121,7 +120,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/generator/template/main@generator.mps
index b8e568d9f72..e7478d81c8c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/generator/template/main@generator.mps
@@ -32,7 +32,7 @@
         <child id="1164826688380" name="menuDescriptor" index="P5bDN" />
         <child id="4323500428121274054" name="id" index="2SqHTX" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -103,7 +103,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -187,7 +187,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/behavior.mps
index cddde56c04d..7038e3f0e80 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/behavior.mps
@@ -45,11 +45,11 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -64,7 +64,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/editor.mps
index 7e2eeb99506..74e82b82a64 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/editor.mps
@@ -54,7 +54,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223386653097" name="jetbrains.mps.lang.editor.structure.StrikeOutStyleSheet" flags="ln" index="3nxI2P" />
@@ -74,7 +74,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -105,7 +105,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/intentions.mps
index 522612bed55..f67c54ec6df 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/intentions.mps
@@ -56,7 +56,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/structure.mps
index 54bb78d39f3..894a37e28db 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/structure.mps
@@ -27,7 +27,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/typesystem.mps
index 6ea597c1742..122a3243094 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.editor/languageModels/typesystem.mps
@@ -30,7 +30,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -67,7 +67,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/com.mbeddr.mpsutil.nodes_tracing.test.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/com.mbeddr.mpsutil.nodes_tracing.test.mpl
index 4a40617f823..45e5978dced 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/com.mbeddr.mpsutil.nodes_tracing.test.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/com.mbeddr.mpsutil.nodes_tracing.test.mpl
@@ -34,7 +34,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -68,7 +68,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -83,7 +82,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/generator/template/main@generator.mps
index ab748a8d588..def59c175c0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/generator/template/main@generator.mps
@@ -113,7 +113,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -165,6 +165,7 @@
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -182,7 +183,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -245,7 +246,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -267,7 +268,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -369,7 +369,7 @@
                               <node concept="2OqwBi" id="7HmzdkqUuBV" role="3clFbG">
                                 <node concept="2OqwBi" id="7HmzdkqUuBW" role="2Oq$k0">
                                   <node concept="37vLTw" id="7HmzdkqUuBX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7HmzdkqUuC1" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2ss" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="7HmzdkqUuBY" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -398,9 +398,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7HmzdkqUuC1" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2ss" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7HmzdkqUuC2" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2st" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -472,7 +472,7 @@
                               <node concept="2OqwBi" id="7HmzdkqUKd3" role="3clFbG">
                                 <node concept="2OqwBi" id="7HmzdkqUKd4" role="2Oq$k0">
                                   <node concept="37vLTw" id="7HmzdkqUKd5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7HmzdkqUKd9" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2su" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="7HmzdkqUKd6" role="2OqNvi">
                                     <node concept="3CFYIy" id="7HmzdkqUKd7" role="3CFYIz">
@@ -484,9 +484,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7HmzdkqUKd9" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2su" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7HmzdkqUKda" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2sv" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/editor.mps
index b66ed176522..4460a8e34f7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/editor.mps
@@ -43,7 +43,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/intentions.mps
index d2a6b5327f9..0b4912354bb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/intentions.mps
@@ -80,7 +80,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/nodes_tracing_utils.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/nodes_tracing_utils.mps
index fcbc7b60a96..06b8185581f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/nodes_tracing_utils.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/nodes_tracing_utils.mps
@@ -138,7 +138,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -156,7 +156,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -219,7 +219,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps
index 7efc08a325d..e0080f8cb6b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps
@@ -74,7 +74,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.mpl
index c7f625e0572..8fe8729f103 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/editor.mps
index 4fcdc423e2d..b7b995c03bb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/editor.mps
@@ -37,21 +37,21 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="3360401466585705291" name="jetbrains.mps.lang.editor.structure.CellModel_ContextAssistant" flags="ng" index="18a60v" />
       <concept id="7342352913006985500" name="jetbrains.mps.lang.editor.structure.TransformationLocation_Completion" flags="ng" index="3eGOoe" />
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="4056398722183895535" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_SubMenu" flags="ng" index="1vlq3a">
@@ -69,7 +69,7 @@
         <property id="1082639509531" name="nullText" index="ilYzB" />
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="4233361609415247331" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Parameter" flags="ig" index="1GhMSn" />
@@ -78,7 +78,7 @@
         <child id="4233361609415241000" name="parameterQuery" index="1GhOrs" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -123,7 +123,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/structure.mps
index 7b4d515497f..c1acd236395 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu.sandbox/models/structure.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/com.mbeddr.mpsutil.parameterizedMenu.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/com.mbeddr.mpsutil.parameterizedMenu.mpl
index 737de3e8c41..5617703bee6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/com.mbeddr.mpsutil.parameterizedMenu.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/com.mbeddr.mpsutil.parameterizedMenu.mpl
@@ -40,7 +40,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -103,7 +103,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">3a48930f-3451-44fd-9b09-4e7ef448f2bb(com.mbeddr.mpsutil.parameterizedMenu)</dependency>
@@ -114,7 +113,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/generator/template/main@generator.mps
index 7103a0c4a46..0d7e132495f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/generator/template/main@generator.mps
@@ -36,7 +36,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -125,7 +125,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -149,7 +149,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -184,7 +184,7 @@
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj">
         <reference id="1200916687663" name="labelDeclaration" index="2sdACS" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -194,7 +194,7 @@
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
-      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ng" index="30XT8A">
+      <concept id="1227303129915" name="jetbrains.mps.lang.generator.structure.AbstractMacro" flags="ngI" index="30XT8A">
         <property id="3265704088513289864" name="comment" index="34cw8o" />
       </concept>
       <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
@@ -223,6 +223,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -300,7 +301,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -327,7 +328,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -1066,7 +1066,7 @@
                                           <node concept="2OqwBi" id="5_UfM9$qVhK" role="3uHU7B">
                                             <node concept="2OqwBi" id="5_UfM9$qVhL" role="2Oq$k0">
                                               <node concept="37vLTw" id="5_UfM9$qVhM" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5_UfM9$qVhQ" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2s$" resolve="it" />
                                               </node>
                                               <node concept="3Tsc0h" id="5_UfM9$qVhN" role="2OqNvi">
                                                 <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
@@ -1080,9 +1080,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="5_UfM9$qVhQ" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2s$" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="5_UfM9$qVhR" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2s_" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/actions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/actions.mps
index 0cf87ba1108..838a4df9bc0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/actions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/actions.mps
@@ -42,7 +42,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -53,6 +53,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -96,7 +97,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -115,7 +116,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -155,15 +155,15 @@
                             <node concept="3clFbF" id="7P1t3vXZTe9" role="3cqZAp">
                               <node concept="2OqwBi" id="7P1t3vXZTzE" role="3clFbG">
                                 <node concept="37vLTw" id="7P1t3vXZTe8" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7P1t3vXZRiV" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2sx" resolve="it" />
                                 </node>
                                 <node concept="1$rogu" id="7P1t3vXZVx3" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7P1t3vXZRiV" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2sx" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7P1t3vXZRiW" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2sy" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/behavior.mps
index 0b52cbf8e87..ad6b87e6529 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/behavior.mps
@@ -65,14 +65,14 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -112,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/constraints.mps
index 4ab03486d2f..e3c8fea41bc 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/constraints.mps
@@ -43,7 +43,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/structure.mps
index bba483730c0..d3c3354913e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.parameterizedMenu/models/structure.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/com.mbeddr.mpsutil.placeholderTextList.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/com.mbeddr.mpsutil.placeholderTextList.mpl
index 15f7d20177e..21f0131dea4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/com.mbeddr.mpsutil.placeholderTextList.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/com.mbeddr.mpsutil.placeholderTextList.mpl
@@ -43,7 +43,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -108,7 +108,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">b8cd51c2-0845-4e1a-be50-29c6044bc90f(com.mbeddr.mpsutil.placeholderTextList.runtime)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
@@ -118,7 +117,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/generator/template/main@generator.mps
index 0fa556c27ce..782146a912c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/generator/template/main@generator.mps
@@ -68,7 +68,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -182,7 +182,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -209,7 +209,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -250,7 +250,7 @@
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj">
         <reference id="1200916687663" name="labelDeclaration" index="2sdACS" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
@@ -302,6 +302,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -392,7 +393,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -410,7 +411,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1657,7 +1657,7 @@
                                         <node concept="2OqwBi" id="XrrhtvD5zd" role="3clFbG">
                                           <node concept="2OqwBi" id="XrrhtvD5ze" role="2Oq$k0">
                                             <node concept="37vLTw" id="XrrhtvD5zf" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="XrrhtvD5zj" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2sB" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="XrrhtvD5zg" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpc2:3Ftr4R6BH0B" resolve="actionId" />
@@ -1671,9 +1671,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="XrrhtvD5zj" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2sB" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="XrrhtvD5zk" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2sC" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1817,7 +1817,7 @@
                                         <node concept="2OqwBi" id="XrrhtvD5$m" role="3clFbG">
                                           <node concept="2OqwBi" id="XrrhtvD5$n" role="2Oq$k0">
                                             <node concept="37vLTw" id="XrrhtvD5$o" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="XrrhtvD5$s" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2sD" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="XrrhtvD5$p" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpc2:3Ftr4R6BH0B" resolve="actionId" />
@@ -1831,9 +1831,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="XrrhtvD5$s" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2sD" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="XrrhtvD5$t" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2sE" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3749,7 +3749,7 @@
                                     <node concept="2OqwBi" id="XrrhtvD5Iv" role="3clFbG">
                                       <node concept="2OqwBi" id="XrrhtvD5Iw" role="2Oq$k0">
                                         <node concept="37vLTw" id="XrrhtvD5Ix" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="XrrhtvD5I_" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2sF" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="XrrhtvD5Iy" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpc2:3Ftr4R6BH0B" resolve="actionId" />
@@ -3763,9 +3763,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="XrrhtvD5I_" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2sF" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="XrrhtvD5IA" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2sG" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3793,7 +3793,7 @@
                                   <node concept="2OqwBi" id="XrrhtvD5IN" role="3clFbG">
                                     <node concept="2OqwBi" id="XrrhtvD5IO" role="2Oq$k0">
                                       <node concept="37vLTw" id="XrrhtvD5IP" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="XrrhtvD5IT" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2sH" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="XrrhtvD5IQ" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpc2:3Ftr4R6BH0B" resolve="actionId" />
@@ -3807,9 +3807,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="XrrhtvD5IT" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2sH" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="XrrhtvD5IU" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2sI" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/behavior.mps
index a48532e533c..6116b77c8e1 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -71,14 +71,14 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -99,7 +99,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/editor.mps
index 2f22c84b519..b9e7c0e9786 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/editor.mps
@@ -6,7 +6,7 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -55,7 +55,7 @@
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -70,7 +70,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1165420413719" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Generic_Group" flags="ng" index="1ou48o">
@@ -104,7 +104,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -169,7 +169,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -204,7 +204,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/structure.mps
index 291ea90087f..047c9a12d69 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.placeholderTextList/models/structure.mps
@@ -45,7 +45,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.mpl
index e3cfc21dd6d..d156c5306d3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)</dependency>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/behavior.mps
index e6db743d299..0de370f36f4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/behavior.mps
@@ -38,7 +38,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -114,7 +114,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -133,7 +133,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -166,7 +166,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/structure.mps
index 876046db163..ec06df611c3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml.node/languageModels/structure.mps
@@ -17,7 +17,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/com.mbeddr.mpsutil.postprocessGeneratedFiles.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/com.mbeddr.mpsutil.postprocessGeneratedFiles.mpl
index faf5ed6c84d..bb0a40d456b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/com.mbeddr.mpsutil.postprocessGeneratedFiles.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/com.mbeddr.mpsutil.postprocessGeneratedFiles.mpl
@@ -42,7 +42,7 @@
         <language slang="l:9ee3d5d2-5388-460b-b1dc-d98f27db499b:com.mbeddr.mpsutil.postprocessGeneratedFiles" version="-1" />
         <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -84,7 +84,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)</dependency>
     <dependency reexport="true">2924833e-8f11-4109-ac0b-20d5a2f3291a(com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime)</dependency>
@@ -99,7 +98,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/generator/template/main@generator.mps
index d397cc26fa7..1a342c12436 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/generator/template/main@generator.mps
@@ -65,7 +65,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -177,7 +177,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/behavior.mps
index 82a2c975afa..9a5c264903e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/behavior.mps
@@ -45,7 +45,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/editor.mps
index efe5d5027f9..d21c355a5ec 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/editor.mps
@@ -37,7 +37,7 @@
       </concept>
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn" />
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/structure.mps
index efff5b4d3b1..5899128df75 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.postprocessGeneratedFiles/models/structure.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl
index 3f1c8e34fed..1a74435916d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl
@@ -45,7 +45,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -55,7 +55,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
         <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
@@ -90,7 +90,6 @@
         <module reference="d4ef9816-d167-4e4e-a083-91ffd61b4c5c(jetbrains.mps.lang.plugin.standalone#481983775135098857)" version="0" />
         <module reference="2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696)" 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" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -124,7 +123,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">32addf6f-1f14-40cb-991d-e0fddb7506c1(com.mbeddr.mpsutil.preferenceform.runtime)</dependency>
@@ -142,7 +140,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -162,7 +160,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps
index 53fbdd42537..8259c921958 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
@@ -87,7 +87,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -201,7 +201,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -225,7 +225,7 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -285,7 +285,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
@@ -342,6 +342,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -362,7 +363,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -451,7 +452,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -478,7 +479,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -938,7 +938,7 @@
                           <node concept="2OqwBi" id="4vnGofExnMU" role="3clFbG">
                             <node concept="2OqwBi" id="4vnGofExlVm" role="2Oq$k0">
                               <node concept="37vLTw" id="4vnGofExlN7" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4vnGofExloV" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2sP" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="4vnGofExmVE" role="2OqNvi">
                                 <ref role="3TsBF5" to="3iid:17qUVvSZm9k" resolve="scope" />
@@ -952,9 +952,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4vnGofExloV" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2sP" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4vnGofExloW" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2sQ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1040,7 +1040,7 @@
                           <node concept="2OqwBi" id="4vnGofExukw" role="3clFbG">
                             <node concept="2OqwBi" id="4vnGofExukx" role="2Oq$k0">
                               <node concept="37vLTw" id="4vnGofExuky" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4vnGofExukA" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2sR" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="4vnGofExukz" role="2OqNvi">
                                 <ref role="3TsBF5" to="3iid:17qUVvSZm9k" resolve="scope" />
@@ -1054,9 +1054,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4vnGofExukA" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2sR" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4vnGofExukB" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2sS" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/behavior.mps
index 56beff069ed..5a7d10b04ca 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/behavior.mps
@@ -109,7 +109,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -120,7 +120,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -175,7 +175,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/constraints.mps
index ecc48565c9c..565922c71ba 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/constraints.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -76,6 +76,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -112,7 +113,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -120,7 +121,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -217,7 +217,7 @@
                         <node concept="2OqwBi" id="2lop6rSgaH6" role="3clFbG">
                           <node concept="2OqwBi" id="2lop6rSgaH7" role="2Oq$k0">
                             <node concept="37vLTw" id="2lop6rSgaH8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSgaHc" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2sL" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2lop6rSgaH9" role="2OqNvi">
                               <ref role="3TsBF5" to="3iid:17qUVvSZm9k" resolve="scope" />
@@ -231,9 +231,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2lop6rSgaHc" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2sL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2lop6rSgaHd" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2sM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -400,7 +400,7 @@
                         <node concept="2OqwBi" id="2lop6rSgaEr" role="3clFbG">
                           <node concept="2OqwBi" id="2lop6rSgaEs" role="2Oq$k0">
                             <node concept="37vLTw" id="2lop6rSgaEt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSgaEx" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2sN" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2lop6rSgaEu" role="2OqNvi">
                               <ref role="3TsBF5" to="3iid:17qUVvSZm9k" resolve="scope" />
@@ -414,9 +414,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2lop6rSgaEx" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2sN" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2lop6rSgaEy" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2sO" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/editor.mps
index fd1ca93a523..fbf9afc15fe 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/editor.mps
@@ -37,7 +37,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -60,7 +60,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -99,7 +99,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/plugin.mps
index 758175f87c7..fcc651a758f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="1e7c1f95-336c-4cec-b00e-8cc6e0c2b265/r:7f89c2e6-099a-4c5a-9dfc-5811a242e68a(com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" 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.preferenceform/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/structure.mps
index ba1435d77a7..c3c8f2d2181 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/structure.mps
@@ -88,7 +88,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/typesystem.mps
index abe8c81ae35..cf1a10d8d5c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/typesystem.mps
@@ -17,7 +17,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -67,7 +67,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl
index b7ae249eae6..8a45e825d70 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl
@@ -34,7 +34,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -72,7 +72,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -85,7 +84,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps
index d5942352467..84afb36f6ee 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps
@@ -41,7 +41,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -132,7 +132,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -154,7 +154,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -196,7 +196,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
@@ -251,6 +251,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -349,7 +350,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -362,7 +363,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
     </language>
@@ -2275,7 +2275,7 @@
                               <ref role="2pIpSl" to="hbjw:43jzEnW9hZ4" resolve="step" />
                               <node concept="36biLy" id="2wdbvPWGOJR" role="28nt2d">
                                 <node concept="37vLTw" id="2wdbvPWGOJQ" role="36biLW">
-                                  <ref role="3cqZAo" node="43jzEnW9YuJ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2sY" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -2285,9 +2285,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="43jzEnW9YuJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2sY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="43jzEnW9YuK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2sZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/behavior.mps
index 6c3ed9b7be2..4282cf6e460 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/behavior.mps
@@ -112,7 +112,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,13 +123,14 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -218,7 +219,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -240,7 +241,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -653,15 +653,15 @@
                   <node concept="3clFbF" id="rF8Sb8D88k" role="3cqZAp">
                     <node concept="2OqwBi" id="rF8Sb8D9R3" role="3clFbG">
                       <node concept="37vLTw" id="rF8Sb8D88j" role="2Oq$k0">
-                        <ref role="3cqZAo" node="rF8Sb8D6P8" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2sT" resolve="it" />
                       </node>
                       <node concept="3x8VRR" id="rF8Sb8DaWi" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="rF8Sb8D6P8" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2sT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="rF8Sb8D6P9" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2sU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1424,7 +1424,7 @@
                               <node concept="2OqwBi" id="2rKkvx5SIp8" role="3clFbG">
                                 <node concept="2OqwBi" id="2rKkvx5SIp9" role="2Oq$k0">
                                   <node concept="37vLTw" id="2rKkvx5SIpa" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2rKkvx5SIpd" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2sV" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="2rKkvx5SIpb" role="2OqNvi">
                                     <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
@@ -1434,9 +1434,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2rKkvx5SIpd" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2sV" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2rKkvx5SIpe" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2sW" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/constraints.mps
index e7fe2098c98..c84b4d5da53 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/constraints.mps
@@ -47,7 +47,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,7 +126,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/editor.mps
index 9578a1f9c8d..b1e07306ae0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/editor.mps
@@ -49,7 +49,7 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -58,7 +58,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -79,7 +79,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -109,7 +109,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/structure.mps
index a7e12e8fd2d..f3463a5555a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/structure.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/typesystem.mps
index 9c2ebc7c938..6574b38baa4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/languageModels/typesystem.mps
@@ -34,7 +34,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -135,7 +135,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/com.mbeddr.mpsutil.propertydefault.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/com.mbeddr.mpsutil.propertydefault.mpl
index 6cb7cbada43..b228c5add44 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/com.mbeddr.mpsutil.propertydefault.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/com.mbeddr.mpsutil.propertydefault.mpl
@@ -31,7 +31,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -81,7 +81,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false" scope="generate-into">760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)</dependency>
@@ -90,7 +89,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/generator/template/main@generator.mps
index 3b28afcec4d..ca49936ebc9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/generator/template/main@generator.mps
@@ -70,7 +70,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -107,7 +107,7 @@
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -170,7 +170,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/editor.mps
index ac967e4e150..0577a7e777a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/editor.mps
@@ -34,7 +34,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -55,7 +55,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/structure.mps
index 451624b1e2b..2d0d4a20fdf 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/structure.mps
@@ -45,7 +45,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/typesystem.mps
index 094f620e1df..f716d8ed8df 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.propertydefault/languageModels/typesystem.mps
@@ -38,7 +38,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -96,7 +96,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/com.mbeddr.mpsutil.rcp.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/com.mbeddr.mpsutil.rcp.mpl
index 0836af0821c..d9c647ca03c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/com.mbeddr.mpsutil.rcp.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/com.mbeddr.mpsutil.rcp.mpl
@@ -46,7 +46,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,7 +54,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
@@ -93,7 +93,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
@@ -106,7 +105,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps
index 2c0ac27c27f..f8622d4864c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
@@ -38,6 +38,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -58,7 +59,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -153,7 +154,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -173,7 +174,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -208,7 +209,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
@@ -272,7 +273,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -310,7 +311,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -596,6 +597,7 @@
   <node concept="sE7Ow" id="7o1blyuIDuo">
     <property role="TrG5h" value="map_NewModelDialogConfigToAction" />
     <property role="2uzpH1" value="foo" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="6oBe0ilSkc8" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/behavior.mps
index fcbb75d9bc5..14afc0c9f1c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/behavior.mps
@@ -61,7 +61,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/editor.mps
index baf8711b255..0f67234edd7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/editor.mps
@@ -51,7 +51,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -84,7 +84,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/structure.mps
index 5ffac509a8a..ad4a8769973 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/structure.mps
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/typesystem.mps
index 1e38b463128..420b1225056 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/languageModels/typesystem.mps
@@ -49,7 +49,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/com.mbeddr.mpsutil.rcp.runtime.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/com.mbeddr.mpsutil.rcp.runtime.msd
index b1425c48f8b..20abef00aae 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/com.mbeddr.mpsutil.rcp.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/com.mbeddr.mpsutil.rcp.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.rcp.runtime" uuid="42c8ef13-588e-4cd4-b2c5-cd0ea26dd727" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.rcp.runtime" uuid="42c8ef13-588e-4cd4-b2c5-cd0ea26dd727" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,7 +21,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/models/com/mbeddr/mpsutil/rcp/runtime.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/models/com/mbeddr/mpsutil/rcp/runtime.mps
index 1d1c78c9848..8f021350cab 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/models/com/mbeddr/mpsutil/rcp/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/runtime/models/com/mbeddr/mpsutil/rcp/runtime.mps
@@ -2,7 +2,7 @@
 <model ref="r:dc582f36-7f2f-4855-8ed2-c9f96fb47f5e(com.mbeddr.mpsutil.rcp.runtime)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -59,7 +59,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -130,7 +130,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -196,7 +196,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -234,7 +234,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -268,6 +268,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -277,7 +278,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -313,7 +314,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -715,15 +715,15 @@
                         <node concept="liA8E" id="7o1blyuHWdT" role="2OqNvi">
                           <ref role="37wK5l" to="fyhk:~VisibleModuleRegistry.isVisible(org.jetbrains.mps.openapi.module.SModule)" resolve="isVisible" />
                           <node concept="37vLTw" id="7o1blyuHWdU" role="37wK5m">
-                            <ref role="3cqZAo" node="7o1blyuHWdV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Dk" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7o1blyuHWdV" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Dk" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7o1blyuHWdW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Dl" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps
index 867f231ab0e..43eab2e5033 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps
@@ -2,7 +2,7 @@
 <model ref="8f16104e-22e6-406d-8251-ef9688474557/r:ab202a93-2128-4d4d-ab72-2fb787f2aec3(com.mbeddr.mpsutil.refactoring.rt/com.mbeddr.mpsutil.refactoring.rt.util)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -39,7 +39,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -131,7 +131,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -151,7 +151,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -183,7 +183,7 @@
       <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/rt.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/rt.msd
index 19bfc6cca67..a5e6271532e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/rt.msd
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.refactoring.rt" uuid="8f16104e-22e6-406d-8251-ef9688474557" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.refactoring.rt" uuid="8f16104e-22e6-406d-8251-ef9688474557" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,7 +21,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps
index a40553b2085..f7def2973c9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps
@@ -6,21 +6,19 @@
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
     <use id="3ecd7c84-cde3-45de-886c-135ecc69b742" name="jetbrains.mps.lang.refactoring" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="4w5v" ref="1fc20ffe-f35b-4791-a0b7-d706bad5c49a/r:18d75373-a465-46d0-9749-aacc22a947bc(com.mbeddr.mpsutil.refactoring/com.mbeddr.mpsutil.refactoring.structure)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="tp1h" ref="r:00000000-0000-4000-0000-011c89590319(jetbrains.mps.lang.refactoring.structure)" />
     <import index="u42p" ref="r:986938bb-bdb1-4307-b062-e4647a4db0f9(jetbrains.mps.ide.platform.refactoring)" />
     <import index="qfni" ref="r:bfb6ca7e-5411-4ee0-a5c0-1edd33370efd(jetbrains.mps.ide.platform.dialogs.choosers)" />
     <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
@@ -55,6 +53,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1211298967294" name="outsideCommandExecution" index="72QZ$" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1205851242421" name="methodDeclaration" index="32lrUH" />
@@ -80,7 +79,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -89,7 +88,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -111,7 +110,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -196,7 +195,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -214,7 +213,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -269,7 +268,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
@@ -323,6 +322,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -331,6 +331,7 @@
     <language id="3ecd7c84-cde3-45de-886c-135ecc69b742" name="jetbrains.mps.lang.refactoring">
       <concept id="6598645150040035709" name="jetbrains.mps.lang.refactoring.structure.IsRefactoringApplicable" flags="nn" index="3trCAK">
         <reference id="6598645150040035710" name="refactoring" index="3trCAN" />
+        <child id="5217171010854307053" name="project" index="3a2dA9" />
         <child id="6598645150040036518" name="target" index="3trCLF" />
       </concept>
       <concept id="6895093993902236229" name="jetbrains.mps.lang.refactoring.structure.Refactoring" flags="ig" index="3SMa$L">
@@ -366,7 +367,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -434,7 +435,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -453,7 +454,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240217271293" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashSetCreator" flags="nn" index="32HrFt" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -635,6 +635,7 @@
     <property role="TrG5h" value="map_RefactoringAction2Action" />
     <property role="2uzpH1" value="Text" />
     <property role="72QZ$" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="6xlxoSXd_8v" role="32lrUH">
       <property role="TrG5h" value="getInput" />
       <node concept="3Tqbb2" id="6xlxoSXd_gb" role="3clF45">
@@ -1217,6 +1218,12 @@
                 </node>
               </node>
             </node>
+            <node concept="2OqwBi" id="1Tx15ZaPhd" role="3a2dA9">
+              <node concept="2WthIp" id="1Tx15ZaPhg" role="2Oq$k0" />
+              <node concept="1DTwFV" id="1Tx15ZaPhi" role="2OqNvi">
+                <ref role="2WH_rO" node="6xlxoSXd9AB" resolve="project" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -1424,7 +1431,7 @@
                         <node concept="2OqwBi" id="3uPd3F$gmT3" role="3clFbG">
                           <node concept="2OqwBi" id="3uPd3F$gmS_" role="2Oq$k0">
                             <node concept="37vLTw" id="5HxjapvyyqL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3uPd3F$gmSb" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2t3" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3uPd3F$gmSG" role="2OqNvi">
                               <ref role="3Tt5mk" to="4w5v:6xlxoSXcYum" resolve="chooser" />
@@ -1438,9 +1445,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3uPd3F$gmSb" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2t3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3uPd3F$gmSc" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2t4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1866,15 +1873,15 @@
                                         <node concept="3clFbF" id="3e2grRPHXTx" role="3cqZAp">
                                           <node concept="2OqwBi" id="3e2grRPHXWw" role="3clFbG">
                                             <node concept="37vLTw" id="3e2grRPHXTw" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3e2grRPHXNy" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2t5" resolve="it" />
                                             </node>
                                             <node concept="2Rxl7S" id="3e2grRPHYri" role="2OqNvi" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="3e2grRPHXNy" role="1bW2Oz">
+                                      <node concept="gl6BB" id="2SR9xrsN2t5" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="3e2grRPHXNz" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="2SR9xrsN2t6" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -3212,15 +3219,15 @@
                               <node concept="3clFbF" id="$jyMwRZaPg" role="3cqZAp">
                                 <node concept="3y3z36" id="$jyMwRZb6J" role="3clFbG">
                                   <node concept="37vLTw" id="$jyMwRZaPj" role="3uHU7B">
-                                    <ref role="3cqZAo" node="$jyMwRZaPk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2t7" resolve="it" />
                                   </node>
                                   <node concept="30H73N" id="$jyMwRZaPi" role="3uHU7w" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="$jyMwRZaPk" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2t7" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="$jyMwRZaPl" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2t8" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/behavior.mps
index cec34011984..b8964adbc5e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/behavior.mps
@@ -68,10 +68,10 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -116,7 +116,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/constraints.mps
index 4e156d62acf..f38da0f5230 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/constraints.mps
@@ -66,7 +66,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +127,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/editor.mps
index f75e3217bb4..fd0b53b1c6b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/editor.mps
@@ -58,7 +58,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/structure.mps
index ca89c04b6e5..0353fc5a3d4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/languageModels/structure.mps
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/refactoring.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/refactoring.mpl
index 7bd4499f7c9..a4cc4476386 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/refactoring.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/refactoring.mpl
@@ -42,12 +42,13 @@
         <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
         <dependency reexport="false">28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)</dependency>
         <dependency reexport="false">677f00fb-4488-405e-9885-abb75d472fd1(com.mbeddr.mpsutil.contextactions)</dependency>
+        <dependency reexport="false">98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -57,7 +58,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+        <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
@@ -89,6 +90,7 @@
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
         <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
+        <module reference="98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.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" />
@@ -102,7 +104,6 @@
         <module reference="2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -129,7 +130,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -145,7 +145,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/com.mbeddr.mpsutil.resources.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/com.mbeddr.mpsutil.resources.mpl
index 39791effb98..f7a0bcb5607 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/com.mbeddr.mpsutil.resources.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/com.mbeddr.mpsutil.resources.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">982eb8df-2c96-4bd7-9963-11712ea622e5(jetbrains.mps.lang.resources)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/behavior.mps
index 39d6735930f..9d7b1381618 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/behavior.mps
@@ -126,7 +126,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -138,7 +138,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -170,7 +170,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/constraints.mps
index 01e49a0346f..ac484fa535c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/constraints.mps
@@ -40,7 +40,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -69,7 +69,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/editor.mps
index 0ec8df68671..f45e36910cf 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/editor.mps
@@ -22,7 +22,7 @@
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -36,7 +36,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps
index 5b456691996..b8f7f6f0e23 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps
@@ -56,7 +56,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/typesystem.mps
index 169003b9450..ff7d90405d9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/typesystem.mps
@@ -35,7 +35,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -71,7 +71,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl
index a6aa6eaa25e..431bbfcf771 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">bb6926d3-ebcc-4ca6-a3be-c618633c0dc1(com.mbeddr.mpsutil.review.runtime)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -23,7 +22,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/editor.mps
index 5bc2481134e..3bd8397ac6d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/editor.mps
@@ -45,7 +45,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -80,7 +80,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -167,7 +167,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -191,7 +191,7 @@
       <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -205,6 +205,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -223,7 +224,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -231,7 +232,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -314,7 +314,7 @@
                                     <ref role="37wK5l" to="u01t:3U5pepj2E1Y" resolve="transcodeToLocalTimeZoneMillis" />
                                     <node concept="2OqwBi" id="5Q45tr0RdSl" role="37wK5m">
                                       <node concept="37vLTw" id="5Q45tr0Re2P" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="48QV5n8clTb" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2ta" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="5Q45tr0RdSn" role="2OqNvi">
                                         <ref role="3TsBF5" to="7krq:4TNdqI4fvDC" resolve="created" />
@@ -323,9 +323,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="48QV5n8clTb" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2ta" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="48QV5n8clTc" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2tb" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="48QV5n8clTd" role="2S7zOq">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/intentions.mps
index 86fb90a5779..5e8407500f5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/intentions.mps
@@ -42,7 +42,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/structure.mps
index 1b7cab0ca45..a8a9da2f0e0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/languageModels/structure.mps
@@ -41,7 +41,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl
index ebb02cc41ab..9b166a6d002 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c788b046-2019-4656-8b60-8bb9bbb177b5(com.mbeddr.mpsutil.review)</dependency>
     <dependency reexport="false">bb6926d3-ebcc-4ca6-a3be-c618633c0dc1(com.mbeddr.mpsutil.review.runtime)</dependency>
@@ -24,7 +23,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl
index 7c9ebf76e49..ad729a46f7f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl
@@ -32,7 +32,7 @@
         <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -69,7 +69,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -86,7 +85,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/generator/template/main@generator.mps
index 60fb748363e..e1387f75f7c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/generator/template/main@generator.mps
@@ -57,6 +57,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -72,7 +73,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -81,7 +82,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="bUwia" id="4rtqL27$CDg">
@@ -113,15 +113,15 @@
                   <node concept="3clFbF" id="4rtqL27$F$z" role="3cqZAp">
                     <node concept="2OqwBi" id="4rtqL27$FBv" role="3clFbG">
                       <node concept="37vLTw" id="4rtqL27$F$x" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4rtqL27$FxM" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2tf" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="4rtqL27$FJl" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4rtqL27$FxM" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tf" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4rtqL27$FxN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2tg" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -143,15 +143,15 @@
                   <node concept="3clFbF" id="4rtqL27$Ik9" role="3cqZAp">
                     <node concept="2OqwBi" id="4rtqL27$Ins" role="3clFbG">
                       <node concept="37vLTw" id="4rtqL27$Ik8" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4rtqL27$Iig" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2th" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="4rtqL27$Ixe" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4rtqL27$Iig" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2th" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4rtqL27$Iih" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2ti" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/behavior.mps
index 7b4b92c1206..7e2909223b9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/behavior.mps
@@ -134,7 +134,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -155,7 +155,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -185,7 +185,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/editor.mps
index 3f11611618b..aa44281e233 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/editor.mps
@@ -71,7 +71,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -93,7 +93,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -178,7 +178,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -194,7 +194,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -231,7 +231,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/intentions.mps
index 63f3b88e3c4..ea394a49808 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/intentions.mps
@@ -76,7 +76,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -145,7 +145,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/structure.mps
index 63f0da04cfa..be2c6bd4ef0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/languageModels/structure.mps
@@ -37,7 +37,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl
index e32d5909497..deed0009562 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl
@@ -36,7 +36,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -91,7 +91,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -104,7 +103,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -123,7 +122,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/generator/template/main@generator.mps
index dc9bf873311..43546fac3be 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/generator/template/main@generator.mps
@@ -62,7 +62,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -73,7 +73,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -96,7 +96,7 @@
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -164,7 +164,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/actions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/actions.mps
index 384ae005b6c..1fd9644d063 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/actions.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <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.richstring/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/behavior.mps
index 564b274f0ba..f3492f54ab4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/behavior.mps
@@ -50,7 +50,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -144,7 +144,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -163,7 +163,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -190,6 +190,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -264,7 +265,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -304,7 +305,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1240217271293" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashSetCreator" flags="nn" index="32HrFt" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
@@ -805,7 +805,7 @@
                           <node concept="3clFbF" id="2UbT3C4jUgT" role="3cqZAp">
                             <node concept="2OqwBi" id="2UbT3C4jUgU" role="3clFbG">
                               <node concept="37vLTw" id="2UbT3C4jUgV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2UbT3C4jUgX" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2tj" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="2UbT3C4jUgW" role="2OqNvi">
                                 <ref role="37wK5l" node="2UbT3C4ekKT" resolve="getConversionFlagSymbol" />
@@ -813,9 +813,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2UbT3C4jUgX" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2tj" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2UbT3C4jUgY" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2tk" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/editor.mps
index ca52faeeea0..f8cece5c8af 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:7c38bd44-8ea3-4ed7-b744-09e999574f84(com.mbeddr.mpsutil.richstring.editor)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
@@ -97,12 +97,12 @@
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -127,7 +127,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -156,7 +156,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -164,7 +164,7 @@
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -182,7 +182,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="3647146066980922272" name="jetbrains.mps.lang.editor.structure.SelectInEditorOperation" flags="nn" index="1OKiuA">
@@ -216,7 +216,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -294,7 +294,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -309,7 +309,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -325,6 +325,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -401,7 +402,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -419,7 +420,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1776,15 +1776,15 @@
                         <node concept="3clFbF" id="2cvVnUuAkUq" role="3cqZAp">
                           <node concept="2OqwBi" id="2cvVnUuAkUr" role="3clFbG">
                             <node concept="37vLTw" id="2cvVnUuAkUs" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2cvVnUuAkUu" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2tl" resolve="it" />
                             </node>
                             <node concept="3NT_Vc" id="2cvVnUuAkUt" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2cvVnUuAkUu" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2tl" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2cvVnUuAkUv" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2tm" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1902,7 +1902,7 @@
                               <node concept="10QFUN" id="2cvVnUuAkVd" role="1eOMHV">
                                 <node concept="2OqwBi" id="2cvVnUuAkVe" role="10QFUP">
                                   <node concept="37vLTw" id="2cvVnUuAkVf" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2cvVnUuAkVi" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2tn" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="2cvVnUuAkVg" role="2OqNvi">
                                     <ref role="37wK5l" to="f4zo:~SubstituteAction.getOutputConcept()" resolve="getOutputConcept" />
@@ -1917,9 +1917,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2cvVnUuAkVi" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2tn" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2cvVnUuAkVj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2to" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2053,15 +2053,15 @@
                         <node concept="3clFbF" id="2cvVnUuAkWx" role="3cqZAp">
                           <node concept="2OqwBi" id="2cvVnUuAkWy" role="3clFbG">
                             <node concept="37vLTw" id="2cvVnUuAkWz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2cvVnUuAkW_" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2tp" resolve="it" />
                             </node>
                             <node concept="3NT_Vc" id="2cvVnUuAkW$" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2cvVnUuAkW_" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2tp" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2cvVnUuAkWA" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2tq" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2225,7 +2225,7 @@
                               <node concept="10QFUN" id="2cvVnUuAkXD" role="1eOMHV">
                                 <node concept="2OqwBi" id="2cvVnUuAkXE" role="10QFUP">
                                   <node concept="37vLTw" id="2cvVnUuAkXF" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2cvVnUuAkXI" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2tr" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="2cvVnUuAkXG" role="2OqNvi">
                                     <ref role="37wK5l" to="f4zo:~SubstituteAction.getOutputConcept()" resolve="getOutputConcept" />
@@ -2240,9 +2240,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2cvVnUuAkXI" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2tr" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2cvVnUuAkXJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2ts" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/plugin.mps
index 7469921e1a2..e5f8a660ad9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:b71bf399-7fda-4c70-b141-468408de8cc3(com.mbeddr.mpsutil.richstring.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -29,7 +29,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -44,7 +44,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/structure.mps
index 5fbf06055c7..2f638ff63fb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/structure.mps
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/typesystem.mps
index 914765887f7..8b1df8ebd20 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/languageModels/typesystem.mps
@@ -102,7 +102,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -119,7 +119,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -129,6 +129,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -245,7 +246,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -281,7 +282,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1240217271293" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashSetCreator" flags="nn" index="32HrFt" />
       <concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -1288,16 +1288,16 @@
                           </node>
                           <node concept="2OqwBi" id="3cdr0_0BRQi" role="1m5AlR">
                             <node concept="37vLTw" id="3cdr0_0BR1B" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3cdr0_0BPGW" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2tt" resolve="it" />
                             </node>
                             <node concept="FGMqu" id="3cdr0_0BT0J" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3cdr0_0BPGW" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2tt" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3cdr0_0BPGX" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2tu" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1313,7 +1313,7 @@
                         <node concept="2OqwBi" id="3cdr0_0C5hO" role="3fr31v">
                           <node concept="2OqwBi" id="3cdr0_0C5hP" role="2Oq$k0">
                             <node concept="37vLTw" id="3cdr0_0C5hQ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Go9U2yG_CP" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2tv" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="3cdr0_0C5hR" role="2OqNvi" />
                           </node>
@@ -1326,7 +1326,7 @@
                       </node>
                       <node concept="2OqwBi" id="6Go9U2yGAjg" role="3uHU7B">
                         <node concept="37vLTw" id="6Go9U2yGA4t" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Go9U2yG_CP" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2tv" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6Go9U2yGBcR" role="2OqNvi">
                           <ref role="3TsBF5" to="tpce:40UcGlRb7V2" resolve="abstract" />
@@ -1335,9 +1335,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Go9U2yG_CP" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tv" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Go9U2yG_CQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2tw" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1358,7 +1358,7 @@
                       <node concept="3clFbF" id="6Go9U2yA7GM" role="3cqZAp">
                         <node concept="2OqwBi" id="6Go9U2yA7O1" role="3clFbG">
                           <node concept="37vLTw" id="6Go9U2yA7GL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Go9U2yA7y$" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2tx" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6Go9U2yA85F" role="2OqNvi">
                             <ref role="3TsBF5" to="tpce:4qF2Hm2r7ja" resolve="conceptAlias" />
@@ -1366,9 +1366,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Go9U2yA7y$" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2tx" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Go9U2yA7y_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2ty" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1399,7 +1399,7 @@
                     <node concept="2OqwBi" id="gIgbGZwpEa" role="3clFbG">
                       <node concept="2OqwBi" id="6Go9U2y_Yud" role="2Oq$k0">
                         <node concept="37vLTw" id="6Go9U2y_YoH" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Go9U2y_YgA" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2tz" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="gIgbGZwpig" role="2OqNvi" />
                       </node>
@@ -1407,9 +1407,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Go9U2y_YgA" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Go9U2y_YgB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2t$" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1485,16 +1485,16 @@
                           </node>
                           <node concept="2OqwBi" id="3cdr0_0Ck08" role="1m5AlR">
                             <node concept="37vLTw" id="3cdr0_0Cjbt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3cdr0_0Cil7" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2t_" resolve="it" />
                             </node>
                             <node concept="FGMqu" id="3cdr0_0Cla_" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3cdr0_0Cil7" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2t_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3cdr0_0Cil8" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2tA" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1510,7 +1510,7 @@
                         <node concept="2OqwBi" id="gIgbGZw5SL" role="3fr31v">
                           <node concept="2OqwBi" id="gIgbGZw5SM" role="2Oq$k0">
                             <node concept="37vLTw" id="gIgbGZw5SN" role="2Oq$k0">
-                              <ref role="3cqZAo" node="gIgbGZvYzp" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2tB" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="gIgbGZw5SO" role="2OqNvi" />
                           </node>
@@ -1523,7 +1523,7 @@
                       </node>
                       <node concept="2OqwBi" id="gIgbGZvYzm" role="3uHU7B">
                         <node concept="37vLTw" id="gIgbGZvYzn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="gIgbGZvYzp" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2tB" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="gIgbGZvYzo" role="2OqNvi">
                           <ref role="3TsBF5" to="tpce:40UcGlRb7V2" resolve="abstract" />
@@ -1532,9 +1532,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="gIgbGZvYzp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="gIgbGZvYzq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2tC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1556,7 +1556,7 @@
                       <node concept="3clFbF" id="6Go9U2yA9eI" role="3cqZAp">
                         <node concept="2OqwBi" id="6Go9U2yA9eJ" role="3clFbG">
                           <node concept="37vLTw" id="6Go9U2yA9eK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Go9U2yA9eM" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2tD" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6Go9U2yA9eL" role="2OqNvi">
                             <ref role="3TsBF5" to="tpce:4qF2Hm2r7ja" resolve="conceptAlias" />
@@ -1564,9 +1564,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Go9U2yA9eM" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2tD" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Go9U2yA9eN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2tE" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1597,7 +1597,7 @@
                     <node concept="2OqwBi" id="gIgbGZwnTZ" role="3clFbG">
                       <node concept="2OqwBi" id="6Go9U2yA9eZ" role="2Oq$k0">
                         <node concept="37vLTw" id="6Go9U2yA9f0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Go9U2yA9f2" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2tF" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="gIgbGZwny5" role="2OqNvi" />
                       </node>
@@ -1605,9 +1605,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Go9U2yA9f2" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tF" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Go9U2yA9f3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2tG" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/com.mbeddr.mpsutil.smodule.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/com.mbeddr.mpsutil.smodule.mpl
index 8cceb8c05c3..b701381337a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/com.mbeddr.mpsutil.smodule.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/com.mbeddr.mpsutil.smodule.mpl
@@ -31,7 +31,7 @@
         <language slang="l:3eada220-3310-4fd3-b794-ff924add7d8a:com.mbeddr.mpsutil.smodule" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -68,7 +68,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -85,7 +84,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/generator/template/main@generator.mps
index 05df2f172f5..4fd766023cb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/generator/template/main@generator.mps
@@ -53,7 +53,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -88,7 +88,7 @@
       <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -192,7 +192,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/behavior.mps
index deb64c967f8..d1a39c1bbbe 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/behavior.mps
@@ -42,7 +42,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -82,18 +82,19 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -112,7 +113,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +135,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1562299158920737514" name="initSize" index="3lWHg$" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -219,15 +219,15 @@
                       </node>
                       <node concept="TSZUe" id="3d01KqFcFKv" role="2OqNvi">
                         <node concept="37vLTw" id="3d01KqFcFNs" role="25WWJ7">
-                          <ref role="3cqZAo" node="3d01KqFcDXb" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2tH" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3d01KqFcDXb" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tH" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3d01KqFcDXc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2tI" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -322,15 +322,15 @@
                       </node>
                       <node concept="TSZUe" id="3d01KqFgB0b" role="2OqNvi">
                         <node concept="37vLTw" id="3d01KqFgB0c" role="25WWJ7">
-                          <ref role="3cqZAo" node="3d01KqFgB0d" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2tJ" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3d01KqFgB0d" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tJ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3d01KqFgB0e" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2tK" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/constraints.mps
index 2530dcf1b26..9142e911617 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/constraints.mps
@@ -92,7 +92,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/editor.mps
index 93d5f289bd0..188dcc5825c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/editor.mps
@@ -46,7 +46,7 @@
         <child id="1139535280620" name="executeFunction" index="1hA7z_" />
       </concept>
       <concept id="1139535439104" name="jetbrains.mps.lang.editor.structure.CellActionMap_ExecuteFunction" flags="in" index="1hAIg9" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -64,7 +64,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -113,7 +113,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/structure.mps
index 7ebf903e5dd..b922e9c852f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/structure.mps
@@ -41,7 +41,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/typesystem.mps
index 1fa5b420644..c2004f0d508 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.smodule/languageModels/typesystem.mps
@@ -116,7 +116,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/com.mbeddr.mpsutil.spreferences.context.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/com.mbeddr.mpsutil.spreferences.context.mpl
index 0c9bd580f77..fb2e7ba2635 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/com.mbeddr.mpsutil.spreferences.context.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/com.mbeddr.mpsutil.spreferences.context.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/actions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/actions.mps
index 361211caa47..f751a9264f4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/actions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/actions.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -80,7 +80,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/editor.mps
index f3ebfece644..e88cd29e478 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/editor.mps
@@ -30,7 +30,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/structure.mps
index 0ad827b4ea7..2a8396a34a3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences.context/languageModels/structure.mps
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.mpl
index 4b648ebc6ac..169f111688e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.mpl
@@ -38,7 +38,7 @@
         <language slang="l:5e845763-f4ca-40bf-b31f-74e236ffed75:com.mbeddr.mpsutil.spreferences.context" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -91,7 +91,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -106,7 +105,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/generator/template/main@generator.mps
index 962709190dd..f0b6ddcdb93 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/generator/template/main@generator.mps
@@ -34,7 +34,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -121,7 +121,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -141,7 +141,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -286,7 +286,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/behavior.mps
index 772f7b67841..96dd978e1f5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/behavior.mps
@@ -83,7 +83,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,7 +94,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -105,7 +105,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
       <concept id="1196350785117" name="jetbrains.mps.lang.quotation.structure.ReferenceAntiquotation" flags="ng" index="2c44tb" />
@@ -148,7 +148,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/editor.mps
index fd0238aa058..9bea5b2ff9c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/editor.mps
@@ -74,7 +74,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -159,7 +159,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -205,7 +205,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/structure.mps
index 706c83e90c0..460b0a9658c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/structure.mps
@@ -40,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/typesystem.mps
index 55c9daf9f84..e4548accc32 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/languageModels/typesystem.mps
@@ -44,7 +44,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -53,7 +53,7 @@
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
       <concept id="1196350785117" name="jetbrains.mps.lang.quotation.structure.ReferenceAntiquotation" flags="ng" index="2c44tb" />
@@ -126,7 +126,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/com.mbeddr.mpsutil.suppresswarning.gen.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/com.mbeddr.mpsutil.suppresswarning.gen.mpl
index 616d9bbb883..915c763cbfc 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/com.mbeddr.mpsutil.suppresswarning.gen.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/com.mbeddr.mpsutil.suppresswarning.gen.mpl
@@ -36,7 +36,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -94,7 +94,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)</dependency>
@@ -105,7 +104,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/generator/template/main@generator.mps
index d8898089164..3394cf566c0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/generator/template/main@generator.mps
@@ -61,7 +61,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -87,13 +87,14 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <property id="6489343236075007666" name="label" index="3hQQBS" />
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
@@ -141,7 +142,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -161,7 +162,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -305,7 +305,7 @@
                       <node concept="10Nm6u" id="QsKt7kzaM1" role="3uHU7w" />
                       <node concept="2OqwBi" id="QsKt7kySAI" role="3uHU7B">
                         <node concept="37vLTw" id="QsKt7kySwu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="QsKt7kySsp" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2tR" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="QsKt7kzayA" role="2OqNvi">
                           <node concept="3CFYIy" id="QsKt7kza$Q" role="3CFYIz">
@@ -316,9 +316,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="QsKt7kySsp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tR" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="QsKt7kySsq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2tS" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/constraints.mps
index 1b1f09cdc01..b904ffad241 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/constraints.mps
@@ -46,7 +46,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -69,6 +69,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -88,7 +89,7 @@
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -107,7 +108,6 @@
       <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
         <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -236,7 +236,7 @@
                         <node concept="1PxgMI" id="2lop6rSgbAW" role="3clFbG">
                           <node concept="2OqwBi" id="2lop6rSgbAX" role="1m5AlR">
                             <node concept="37vLTw" id="2lop6rSgbAY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2lop6rSgbB1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2tO" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2lop6rSgbAZ" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SAbstractConcept.getDeclarationNode()" resolve="getDeclarationNode" />
@@ -248,9 +248,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2lop6rSgbB1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2tO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2lop6rSgbB2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2tP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/editor.mps
index 4d013c137d3..8b9e1be93dd 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/editor.mps
@@ -51,7 +51,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -100,7 +100,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -116,7 +116,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/intentions.mps
index 88c7b3f4c1a..9f64bb5549c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/intentions.mps
@@ -59,7 +59,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/structure.mps
index efc06903f8b..a01af14af96 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/structure.mps
@@ -38,7 +38,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/typesystem.mps
index b2f08082bec..5fe758f90de 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning.gen/languageModels/typesystem.mps
@@ -112,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.mpl
index 5784f9c2c12..dc1edf57085 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.mpl
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/behavior.mps
index 158815ec650..cd4f2be77a5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/behavior.mps
@@ -86,7 +86,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,7 +95,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -138,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/editor.mps
index 73966f1b72f..3fc1a5d96a7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/editor.mps
@@ -57,7 +57,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -86,7 +86,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -99,7 +99,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/intentions.mps
index 0c01555a19d..2e9a28f3171 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/intentions.mps
@@ -59,7 +59,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/structure.mps
index 0f2c8c56484..6c232cb1b36 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/structure.mps
@@ -41,7 +41,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/typesystem.mps
index d8b9de77843..ef459189441 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/languageModels/typesystem.mps
@@ -90,7 +90,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/com.mbeddr.mpsutil.typsystem.trace.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/com.mbeddr.mpsutil.typsystem.trace.mpl
index 4c74c6029cf..d8bcd684cdc 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/com.mbeddr.mpsutil.typsystem.trace.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/com.mbeddr.mpsutil.typsystem.trace.mpl
@@ -39,7 +39,7 @@
         <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -111,7 +111,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
@@ -121,7 +120,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/generator/template/main@generator.mps
index a7de014cbbf..2f7ab27a0ec 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/generator/template/main@generator.mps
@@ -74,7 +74,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -206,7 +206,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/editor.mps
index fad0d506428..84821866816 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/editor.mps
@@ -30,7 +30,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/structure.mps
index 55533fd31d5..5aa462c751a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.typsystem.trace/languageModels/structure.mps
@@ -25,7 +25,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/com.mbeddr.mpsutil.uniquenames.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/com.mbeddr.mpsutil.uniquenames.mpl
index d01dccf1b14..61027e80914 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/com.mbeddr.mpsutil.uniquenames.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/com.mbeddr.mpsutil.uniquenames.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -29,7 +28,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -48,7 +47,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/editor.mps
index e7d795b002c..0e1f70ba2a8 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/editor.mps
@@ -38,6 +38,8 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" implicit="true" />
     <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" implicit="true" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
+    <import index="w827" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs.openapi(MPS.Core/)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -143,7 +145,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -192,7 +194,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -245,7 +247,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -323,7 +325,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -339,7 +341,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -363,6 +365,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -447,7 +450,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -481,7 +484,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1843,7 +1845,7 @@
                         <node concept="3clFbF" id="6UyJMA9G3Fp" role="3cqZAp">
                           <node concept="2Sg_IR" id="6UyJMA9G3Fq" role="3clFbG">
                             <node concept="37vLTw" id="2BHiRxghfTj" role="2SgG2M">
-                              <ref role="3cqZAo" node="6UyJMA9G3Fw" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2tV" resolve="it" />
                             </node>
                             <node concept="1Q80Hx" id="6UyJMA9G3Fs" role="2SgHGx" />
                             <node concept="pncrf" id="6UyJMA9G3Ft" role="2SgHGx" />
@@ -1852,9 +1854,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6UyJMA9G3Fw" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2tV" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6UyJMA9G3Fx" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2tW" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2370,7 +2372,7 @@
                           <node concept="3clFbF" id="6UyJMA9G3DT" role="3cqZAp">
                             <node concept="2Sg_IR" id="6UyJMA9G3DU" role="3clFbG">
                               <node concept="37vLTw" id="2BHiRxgm86d" role="2SgG2M">
-                                <ref role="3cqZAo" node="6UyJMA9G3E0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2tX" resolve="it" />
                               </node>
                               <node concept="1Q80Hx" id="6UyJMA9G3DW" role="2SgHGx" />
                               <node concept="pncrf" id="6UyJMA9G3DX" role="2SgHGx" />
@@ -2379,9 +2381,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6UyJMA9G3E0" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2tX" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6UyJMA9G3E1" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2tY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2936,10 +2938,15 @@
                 <node concept="17QB3L" id="hP3azYc" role="1tU5fm" />
                 <node concept="2OqwBi" id="hy079Lc" role="33vP2m">
                   <node concept="2YIFZM" id="6tm98vZifEl" role="2Oq$k0">
-                    <ref role="37wK5l" to="18ew:~MacrosFactory.forModule(jetbrains.mps.project.AbstractModule)" resolve="forModule" />
+                    <ref role="37wK5l" to="18ew:~MacrosFactory.forModule(org.jetbrains.mps.openapi.module.SModule)" resolve="forModule" />
                     <ref role="1Pybhc" to="18ew:~MacrosFactory" resolve="MacrosFactory" />
-                    <node concept="37vLTw" id="3GM_nagTruw" role="37wK5m">
-                      <ref role="3cqZAo" node="gTqSnTV" resolve="l" />
+                    <node concept="10QFUN" id="1wjaGbcNGbK" role="37wK5m">
+                      <node concept="3uibUv" id="1wjaGbcNHhz" role="10QFUM">
+                        <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                      </node>
+                      <node concept="37vLTw" id="3GM_nagTruw" role="10QFUP">
+                        <ref role="3cqZAo" node="gTqSnTV" resolve="l" />
+                      </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="hy079Ld" role="2OqNvi">
@@ -2973,12 +2980,16 @@
                   <ref role="37wK5l" to="3ju5:~IFile.exists()" resolve="exists" />
                 </node>
                 <node concept="2OqwBi" id="4RnppgkkcW5" role="2Oq$k0">
-                  <node concept="2YIFZM" id="4RnppgkkcW3" role="2Oq$k0">
-                    <ref role="1Pybhc" to="3ju5:~FileSystem" resolve="FileSystem" />
-                    <ref role="37wK5l" to="3ju5:~FileSystem.getInstance()" resolve="getInstance" />
+                  <node concept="2OqwBi" id="1wjaGbcNIsu" role="2Oq$k0">
+                    <node concept="37vLTw" id="1wjaGbcNHYY" role="2Oq$k0">
+                      <ref role="3cqZAo" node="gTqSnTV" resolve="l" />
+                    </node>
+                    <node concept="liA8E" id="1wjaGbcNKPD" role="2OqNvi">
+                      <ref role="37wK5l" to="z1c3:~AbstractModule.getFileSystem()" resolve="getFileSystem" />
+                    </node>
                   </node>
                   <node concept="liA8E" id="4RnppgkkcW9" role="2OqNvi">
-                    <ref role="37wK5l" to="3ju5:~FileSystem.getFile(java.lang.String)" resolve="getFile" />
+                    <ref role="37wK5l" to="w827:~FileSystem.getFile(java.lang.String)" resolve="getFile" />
                     <node concept="37vLTw" id="3GM_nagTyHB" role="37wK5m">
                       <ref role="3cqZAo" node="gTqTi9T" resolve="s" />
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/plugin.mps
index c0e50ec8ca8..d34da700b80 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.uniquenames/languageModels/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:8f9f0c80-5aee-4648-9b9d-3c8c43b40821(com.mbeddr.mpsutil.uniquenames.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -141,7 +141,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -163,7 +163,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -189,6 +189,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -213,7 +214,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -239,7 +240,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -675,7 +675,7 @@
                       <node concept="2OqwBi" id="7qMLXK8HUva" role="33vP2m">
                         <node concept="2OqwBi" id="7qMLXK8HUvb" role="2Oq$k0">
                           <node concept="37vLTw" id="7qMLXK8HUvc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7wFJH9j$aN" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2tZ" resolve="it" />
                           </node>
                           <node concept="3AY5_j" id="7qMLXK8HUvd" role="2OqNvi" />
                         </node>
@@ -760,7 +760,7 @@
                       <node concept="3EllGN" id="7wFJH9jAFG" role="37vLTJ">
                         <node concept="2OqwBi" id="7wFJH9jBjq" role="3ElVtu">
                           <node concept="37vLTw" id="7wFJH9jB1B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7wFJH9j$aN" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2tZ" resolve="it" />
                           </node>
                           <node concept="3AY5_j" id="7wFJH9jBVY" role="2OqNvi" />
                         </node>
@@ -771,9 +771,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7wFJH9j$aN" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2tZ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7wFJH9j$aO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2u0" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -830,7 +830,7 @@
                             <node concept="2OqwBi" id="7wFJH9jWnN" role="3clFbG">
                               <node concept="2OqwBi" id="7wFJH9jWnO" role="2Oq$k0">
                                 <node concept="37vLTw" id="7wFJH9jWnP" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7wFJH9jWnT" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2u1" resolve="it" />
                                 </node>
                                 <node concept="3AV6Ez" id="7wFJH9jWnQ" role="2OqNvi" />
                               </node>
@@ -842,9 +842,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7wFJH9jWnT" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2u1" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7wFJH9jWnU" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2u2" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="1nlBCl" id="7wFJH9jWnV" role="2S7zOq">
@@ -981,14 +981,14 @@
                                       <node concept="37vLTI" id="49195GpXkIq" role="3clFbG">
                                         <node concept="2OqwBi" id="49195GpXl4$" role="37vLTx">
                                           <node concept="37vLTw" id="49195GpXkY2" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="49195GpXiWw" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2u3" resolve="it" />
                                           </node>
                                           <node concept="3AY5_j" id="49195GpXlKY" role="2OqNvi" />
                                         </node>
                                         <node concept="3EllGN" id="49195GpXjvm" role="37vLTJ">
                                           <node concept="2OqwBi" id="49195GpXjNA" role="3ElVtu">
                                             <node concept="37vLTw" id="49195GpXjCA" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="49195GpXiWw" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2u3" resolve="it" />
                                             </node>
                                             <node concept="3AY5_j" id="49195GpXkuN" role="2OqNvi" />
                                           </node>
@@ -999,9 +999,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="49195GpXiWw" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2u3" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="49195GpXiWx" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2u4" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1101,7 +1101,7 @@
                             <node concept="2OqwBi" id="7qMLXK8HrLt" role="3K4Cdx">
                               <node concept="2OqwBi" id="7qMLXK8Hp_K" role="2Oq$k0">
                                 <node concept="37vLTw" id="7qMLXK8HptN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7wFJH9lgaj" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2u5" resolve="it" />
                                 </node>
                                 <node concept="3AV6Ez" id="7qMLXK8HqBB" role="2OqNvi" />
                               </node>
@@ -1112,7 +1112,7 @@
                         <node concept="2OqwBi" id="7wFJH9ljFw" role="3uHU7B">
                           <node concept="2OqwBi" id="7wFJH9lhYK" role="2Oq$k0">
                             <node concept="37vLTw" id="7wFJH9lhSg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7wFJH9lgaj" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2u5" resolve="it" />
                             </node>
                             <node concept="3AV6Ez" id="7wFJH9liA8" role="2OqNvi" />
                           </node>
@@ -1126,7 +1126,7 @@
                       <node concept="3EllGN" id="7wFJH9lgDn" role="37vLTJ">
                         <node concept="2OqwBi" id="7wFJH9lgSf" role="3ElVtu">
                           <node concept="37vLTw" id="7wFJH9lgMr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7wFJH9lgaj" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2u5" resolve="it" />
                           </node>
                           <node concept="3AY5_j" id="7wFJH9lhzj" role="2OqNvi" />
                         </node>
@@ -1137,9 +1137,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7wFJH9lgaj" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2u5" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7wFJH9lgak" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2u6" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/com.mbeddr.mpsutil.userstyles.buildutils.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/com.mbeddr.mpsutil.userstyles.buildutils.mpl
index fec4286ac70..9d22a66ad37 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/com.mbeddr.mpsutil.userstyles.buildutils.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/com.mbeddr.mpsutil.userstyles.buildutils.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">798100da-4f0a-421a-b991-71f8c50ce5d2(jetbrains.mps.build)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/models/intentions.mps
index d0fcf080e6f..9ee1e751ef9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/models/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.buildutils/models/intentions.mps
@@ -102,7 +102,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -125,7 +125,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -149,6 +149,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -192,7 +193,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -212,7 +213,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -794,7 +794,7 @@
                           <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                           <node concept="3cpWs3" id="2Z2H3pkXFnX" role="37wK5m">
                             <node concept="37vLTw" id="2Z2H3pkXFoq" role="3uHU7w">
-                              <ref role="3cqZAo" node="18ZQZhoUY$N" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2u7" resolve="it" />
                             </node>
                             <node concept="Xl_RD" id="2Z2H3pkXDtw" role="3uHU7B">
                               <property role="Xl_RC" value="file: " />
@@ -807,7 +807,7 @@
                       <node concept="2OqwBi" id="18ZQZhoUZfE" role="3clFbG">
                         <node concept="2OqwBi" id="18ZQZhoUYOU" role="2Oq$k0">
                           <node concept="37vLTw" id="18ZQZhoUYH0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="18ZQZhoUY$N" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2u7" resolve="it" />
                           </node>
                           <node concept="liA8E" id="18ZQZhoUZ50" role="2OqNvi">
                             <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
@@ -822,9 +822,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="18ZQZhoUY$N" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2u7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="18ZQZhoUY$O" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2u8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/com.mbeddr.mpsutil.userstyles.sandboxlang.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/com.mbeddr.mpsutil.userstyles.sandboxlang.mpl
index a74b9fdf81f..ae4d86db297 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/com.mbeddr.mpsutil.userstyles.sandboxlang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/com.mbeddr.mpsutil.userstyles.sandboxlang.mpl
@@ -28,7 +28,7 @@
         <language slang="l:33745ab7-37dd-4c72-914d-eee6d52b9b33:com.mbeddr.mpsutil.userstyles.sandboxlang" 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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -53,13 +53,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:62a3babb-5d40-4920-897f-d4144dc99c9d:com.mbeddr.mpsutil.userstyles" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/generator/template/main@generator.mps
index 7f651259bd8..405e1d4eefa 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/generator/template/main@generator.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/editor.mps
index 7a73ca956b6..e0fecb09655 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/editor.mps
@@ -36,7 +36,7 @@
       <concept id="1186414999511" name="jetbrains.mps.lang.editor.structure.UnderlinedStyleClassItem" flags="ln" index="VQ3r3" />
       <concept id="1214406454886" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorStyleClassItem" flags="ln" index="30gYXW" />
       <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223386653097" name="jetbrains.mps.lang.editor.structure.StrikeOutStyleSheet" flags="ln" index="3nxI2P" />
@@ -47,7 +47,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
@@ -63,7 +63,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/structure.mps
index ee645c1aa96..d2b736aec1f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles.sandboxlang/models/structure.mps
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/com.mbeddr.mpsutil.userstyles.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/com.mbeddr.mpsutil.userstyles.mpl
index 74b8e797baa..cad74a8c189 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/com.mbeddr.mpsutil.userstyles.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/com.mbeddr.mpsutil.userstyles.mpl
@@ -36,7 +36,7 @@
         <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" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -133,7 +133,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="true">664f2630-ebf5-429d-b331-94ccdf5410f6(com.mbeddr.mpsutil.userstyles.runtime)</dependency>
@@ -142,7 +141,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/generator/template/main@generator.mps
index 53a8f3e8f34..2c3aaead003 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/generator/template/main@generator.mps
@@ -52,7 +52,7 @@
       <concept id="9122903797312246523" name="jetbrains.mps.lang.editor.structure.StyleReference" flags="ng" index="1wgc9g">
         <reference id="9122903797312247166" name="style" index="1wgcnl" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
@@ -147,7 +147,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -159,7 +159,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -191,7 +191,7 @@
       </concept>
       <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4" />
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167087469898" name="jetbrains.mps.lang.generator.structure.CreateRootRule" flags="lg" index="2VPoh5">
@@ -241,6 +241,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -318,7 +319,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -345,7 +346,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
@@ -1818,7 +1818,7 @@
                             <node concept="v3k3i" id="Vx4CqFG84J" role="2OqNvi">
                               <node concept="25Kdxt" id="Vx4CqFG84K" role="v3oSu">
                                 <node concept="37vLTw" id="Vx4CqFG84L" role="25KhWn">
-                                  <ref role="3cqZAo" node="Vx4CqFG84W" resolve="mustExist" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2uh" resolve="mustExist" />
                                 </node>
                               </node>
                             </node>
@@ -1833,9 +1833,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Vx4CqFG84W" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2uh" role="1bW2Oz">
                     <property role="TrG5h" value="mustExist" />
-                    <node concept="2jxLKc" id="Vx4CqFG84X" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2ui" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1936,7 +1936,7 @@
                           <node concept="3clFbF" id="Vx4CqFLKey" role="3cqZAp">
                             <node concept="2OqwBi" id="Vx4CqFLKq7" role="3clFbG">
                               <node concept="37vLTw" id="Vx4CqFLKex" role="2Oq$k0">
-                                <ref role="3cqZAo" node="Vx4CqFLK0L" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2uj" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="Vx4CqFLK_n" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1944,9 +1944,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="Vx4CqFLK0L" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2uj" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="Vx4CqFLK0M" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2uk" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/behavior.mps
index 4e28db5e200..67dce8629d3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/behavior.mps
@@ -56,7 +56,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -64,7 +64,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -75,6 +75,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -120,7 +121,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -128,7 +129,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
@@ -165,7 +165,7 @@
                           <node concept="2OqwBi" id="5l2JxZPaL8M" role="3K4GZi">
                             <node concept="2OqwBi" id="5l2JxZPaKPa" role="2Oq$k0">
                               <node concept="37vLTw" id="5l2JxZPaKIE" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5l2JxZPaDE0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2ua" resolve="it" />
                               </node>
                               <node concept="2yIwOk" id="5l2JxZPaKXo" role="2OqNvi" />
                             </node>
@@ -173,7 +173,7 @@
                           </node>
                           <node concept="2OqwBi" id="5l2JxZPaKes" role="3K4Cdx">
                             <node concept="37vLTw" id="5l2JxZPaK9e" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5l2JxZPaDE0" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ua" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5l2JxZPaKlP" role="2OqNvi">
                               <node concept="chp4Y" id="5l2JxZPaKrF" role="cj9EA">
@@ -184,7 +184,7 @@
                           <node concept="2OqwBi" id="5l2JxZPaDMi" role="3K4E3e">
                             <node concept="1PxgMI" id="5l2JxZPaQZq" role="2Oq$k0">
                               <node concept="37vLTw" id="5l2JxZPaDIt" role="1m5AlR">
-                                <ref role="3cqZAo" node="5l2JxZPaDE0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2ua" resolve="it" />
                               </node>
                               <node concept="chp4Y" id="5RIakkDJ4fC" role="3oSUPX">
                                 <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
@@ -197,9 +197,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5l2JxZPaDE0" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2ua" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5l2JxZPaDE1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2ub" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -293,7 +293,7 @@
                     <node concept="3clFbF" id="Vx4CqFPwiX" role="3cqZAp">
                       <node concept="2OqwBi" id="Vx4CqFPwoC" role="3clFbG">
                         <node concept="37vLTw" id="Vx4CqFPwiW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="Vx4CqFPwfg" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2uc" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="Vx4CqFPw_P" role="2OqNvi">
                           <node concept="3CFYIy" id="Vx4CqFPwEo" role="3CFYIz">
@@ -303,9 +303,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Vx4CqFPwfg" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2uc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Vx4CqFPwfh" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2ud" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -316,15 +316,15 @@
                   <node concept="3clFbF" id="Vx4CqFPx6u" role="3cqZAp">
                     <node concept="2OqwBi" id="Vx4CqFPxcx" role="3clFbG">
                       <node concept="37vLTw" id="Vx4CqFPx6t" role="2Oq$k0">
-                        <ref role="3cqZAo" node="Vx4CqFPx4o" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2ue" resolve="it" />
                       </node>
                       <node concept="3x8VRR" id="Vx4CqFPxq1" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="Vx4CqFPx4o" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2ue" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="Vx4CqFPx4p" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2uf" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/editor.mps
index f3f1a2c6970..7f87d5e81a7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/editor.mps
@@ -41,7 +41,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/intentions.mps
index a0cda9caab5..7d0bf72383c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/intentions.mps
@@ -54,7 +54,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -97,7 +97,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/structure.mps
index 8cd38df38b0..c443b56e09e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.userstyles/models/structure.mps
@@ -48,7 +48,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/com.mbeddr.mpsutil.varscope.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/com.mbeddr.mpsutil.varscope.mpl
index 996191b60ba..78d9298f753 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/com.mbeddr.mpsutil.varscope.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/com.mbeddr.mpsutil.varscope.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8e4567d9-0513-47fd-bfe7-fa3b33fe03ab(com.mbeddr.mpsutil.varscope.runtime)</dependency>
   </dependencies>
@@ -19,7 +18,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/behavior.mps
index 3354ae14462..42d027c18cb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/behavior.mps
@@ -107,7 +107,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -120,7 +120,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -149,7 +149,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/structure.mps
index 79618c06a3b..cf49d3b1021 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/structure.mps
@@ -21,7 +21,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/typesystem.mps
index 8aa4ab9bb27..5362e5739c6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/typesystem.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.varscope/models/typesystem.mps
@@ -60,7 +60,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -99,7 +99,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/com.mbeddr.mpsutil.xml.fix.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/com.mbeddr.mpsutil.xml.fix.mpl
index a4ce7d30c73..001281616b7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/com.mbeddr.mpsutil.xml.fix.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/com.mbeddr.mpsutil.xml.fix.mpl
@@ -30,7 +30,24 @@
         <dependency reexport="false">479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)</dependency>
         <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
       </dependencies>
-      <languageVersions />
+      <languageVersions>
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
+        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+      </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
         <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
@@ -66,7 +83,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)</dependency>
     <dependency reexport="false">f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)</dependency>
@@ -75,7 +91,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -96,7 +112,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/generator/template/com.mbeddr.mpsutil.xml.fix.generator@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/generator/template/com.mbeddr.mpsutil.xml.fix.generator@generator.mps
new file mode 100644
index 00000000000..f2467004d51
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/generator/template/com.mbeddr.mpsutil.xml.fix.generator@generator.mps
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:f11547b6-cb33-43eb-8975-979d9d8b894a(com.mbeddr.mpsutil.xml.fix.generator@generator)">
+  <persistence version="9" />
+  <languages>
+    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
+  </languages>
+  <imports>
+    <import index="gj7q" ref="r:a638218c-68e6-4c52-ab40-23f5599d326d(com.mbeddr.mpsutil.xml.fix.structure)" />
+  </imports>
+  <registry>
+    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="bUwia" id="28qPK3ZC476">
+    <property role="TrG5h" value="main" />
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/languageModels/com.mbeddr.mpsutil.xml.fix.plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/languageModels/com.mbeddr.mpsutil.xml.fix.plugin.mps
index fd90660b4d8..8da2f81ff58 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/languageModels/com.mbeddr.mpsutil.xml.fix.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.xml.fix/languageModels/com.mbeddr.mpsutil.xml.fix.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -112,7 +112,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -133,7 +133,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -210,7 +210,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl
index ef50374054e..10945633f55 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d0fe2e60-9f9c-4d3c-94aa-de9257b67a6d(com.mbeddr.mpsutil.multilingual.concept)</dependency>
   </dependencies>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/editor.mps
index 2c2c10846a6..9a3178b8c75 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/editor.mps
@@ -34,7 +34,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -47,7 +47,7 @@
       <concept id="2510545900188223991" name="com.mbeddr.mpsutil.multilingual.editor.structure.MultilingualConstant" flags="ng" index="3ZRKB6" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -59,7 +59,7 @@
         <property id="568377005202317272" name="default" index="3MtHw7" />
         <property id="568377005202317271" name="technicalKey" index="3MtHw8" />
       </concept>
-      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
+      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
         <reference id="2510545900188083932" name="key" index="3ZOmrH" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/structure.mps
index 0abb822d3a4..22e3fe7f444 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/languageModels/structure.mps
@@ -38,7 +38,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/generator/template/main@generator.mps
index 5e13edaada5..2188423dc3d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/sampleXcoreTestLanguage.mpl b/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/sampleXcoreTestLanguage.mpl
index 3c7564c082e..afba4777476 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/sampleXcoreTestLanguage.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/sampleXcoreTestLanguage/sampleXcoreTestLanguage.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps
index ef504fb4270..31b8508cd6a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:ab50d504-3c45-46c5-9732-ab1e5b810f3a(test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure)">
+<model ref="r:679ddd2a-675f-4aaf-8311-c8eecf410a8f(test.com.mbeddr.mpsutil.ecoreimporter.testingFrameworkTestLanguageMatch)">
   <persistence version="9" />
   <languages>
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
@@ -7,6 +7,7 @@
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="gj51" ref="r:ab50d504-3c45-46c5-9732-ab1e5b810f3a(test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore">
@@ -62,56 +63,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="25R3W" id="apJ4OR7VSO">
-    <property role="TrG5h" value="enumTest" />
-    <property role="3F6X1D" value="187387899335917108" />
-    <node concept="25R33" id="apJ4OR7XgR" role="25R1y">
-      <property role="3tVfz5" value="0" />
-      <property role="TrG5h" value="test1" />
-    </node>
-    <node concept="25R33" id="apJ4OR7XgT" role="25R1y">
-      <property role="3tVfz5" value="1" />
-      <property role="TrG5h" value="test12" />
-    </node>
-    <node concept="25R33" id="apJ4OR7XgW" role="25R1y">
-      <property role="3tVfz5" value="2" />
-      <property role="TrG5h" value="test13" />
-    </node>
-  </node>
-  <node concept="25R3W" id="apJ4OR7VST">
-    <property role="TrG5h" value="enumTest2" />
-    <property role="3F6X1D" value="187387899335917113" />
-    <node concept="25R33" id="apJ4OR7Xh0" role="25R1y">
-      <property role="3tVfz5" value="0" />
-      <property role="TrG5h" value="val1" />
-    </node>
-    <node concept="25R33" id="apJ4OR7Xh2" role="25R1y">
-      <property role="3tVfz5" value="1" />
-      <property role="TrG5h" value="val2" />
-    </node>
-    <node concept="25R33" id="apJ4OR7Xh5" role="25R1y">
-      <property role="3tVfz5" value="2" />
-      <property role="TrG5h" value="val3" />
-    </node>
-  </node>
-  <node concept="PlHQZ" id="7CVN7FEkFW_">
-    <property role="TrG5h" value="i_SuperClass2" />
-    <property role="EcuMT" value="8807858324542504741" />
-    <node concept="1TJgyj" id="7CVN7FEkFWy" role="1TKVEi">
-      <property role="IQ2ns" value="8807858324542504738" />
-      <property role="20kJfa" value="sp2ref2" />
-      <ref role="20lvS9" node="7CVN7FEkFW9" />
-    </node>
-  </node>
-  <node concept="PlHQZ" id="7CVN7FEkFWB">
-    <property role="TrG5h" value="i_SuperClass3" />
-    <property role="EcuMT" value="8807858324542504743" />
-    <node concept="1TJgyi" id="7CVN7FEkFWs" role="1TKVEl">
-      <property role="IQ2nx" value="8807858324542504732" />
-      <property role="TrG5h" value="sp3int3" />
-      <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="7CVN7FEkFWm">
     <property role="R5$K7" value="false" />
     <property role="19KtqR" value="true" />
@@ -144,6 +95,24 @@
       <ref role="PrY4T" node="7CVN7FEkFWB" resolve="i_SuperClass3" />
     </node>
   </node>
+  <node concept="PlHQZ" id="7CVN7FEkFW_">
+    <property role="TrG5h" value="i_SuperClass2" />
+    <property role="EcuMT" value="8807858324542504741" />
+    <node concept="1TJgyj" id="7CVN7FEkFWy" role="1TKVEi">
+      <property role="IQ2ns" value="8807858324542504738" />
+      <property role="20kJfa" value="sp2ref2" />
+      <ref role="20lvS9" to="gj51:7CVN7FEkFW9" />
+    </node>
+  </node>
+  <node concept="PlHQZ" id="7CVN7FEkFWB">
+    <property role="TrG5h" value="i_SuperClass3" />
+    <property role="EcuMT" value="8807858324542504743" />
+    <node concept="1TJgyi" id="7CVN7FEkFWs" role="1TKVEl">
+      <property role="IQ2nx" value="8807858324542504732" />
+      <property role="TrG5h" value="sp3int3" />
+      <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
+    </node>
+  </node>
   <node concept="1TIwiD" id="7CVN7FEkFW9">
     <property role="R5$K7" value="false" />
     <property role="19KtqR" value="true" />
@@ -195,12 +164,44 @@
     <node concept="1TJgyi" id="17qUVvSZm9K" role="1TKVEl">
       <property role="TrG5h" value="prop1" />
       <property role="IQ2nx" value="1286599818956595824" />
-      <ref role="AX2Wp" node="apJ4OR7VSO" resolve="enumTest1" />
+      <ref role="AX2Wp" to="gj51:apJ4OR7VSO" resolve="enumTest1" />
     </node>
     <node concept="1TJgyi" id="17qUVvSZm9M" role="1TKVEl">
       <property role="TrG5h" value="prop2" />
       <property role="IQ2nx" value="1286599818956595826" />
-      <ref role="AX2Wp" node="apJ4OR7VST" resolve="enumTest2" />
+      <ref role="AX2Wp" to="gj51:apJ4OR7VST" resolve="enumTest2" />
+    </node>
+  </node>
+  <node concept="25R3W" id="apJ4OR7VSO">
+    <property role="TrG5h" value="enumTest" />
+    <property role="3F6X1D" value="187387899335917108" />
+    <node concept="25R33" id="apJ4OR7XgR" role="25R1y">
+      <property role="3tVfz5" value="0" />
+      <property role="TrG5h" value="test1" />
+    </node>
+    <node concept="25R33" id="apJ4OR7XgT" role="25R1y">
+      <property role="3tVfz5" value="1" />
+      <property role="TrG5h" value="test12" />
+    </node>
+    <node concept="25R33" id="apJ4OR7XgW" role="25R1y">
+      <property role="3tVfz5" value="2" />
+      <property role="TrG5h" value="test13" />
+    </node>
+  </node>
+  <node concept="25R3W" id="apJ4OR7VST">
+    <property role="TrG5h" value="enumTest2" />
+    <property role="3F6X1D" value="187387899335917113" />
+    <node concept="25R33" id="apJ4OR7Xh0" role="25R1y">
+      <property role="3tVfz5" value="0" />
+      <property role="TrG5h" value="val1" />
+    </node>
+    <node concept="25R33" id="apJ4OR7Xh2" role="25R1y">
+      <property role="3tVfz5" value="1" />
+      <property role="TrG5h" value="val2" />
+    </node>
+    <node concept="25R33" id="apJ4OR7Xh5" role="25R1y">
+      <property role="3tVfz5" value="2" />
+      <property role="TrG5h" value="val3" />
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/generator/template/main@generator.mps
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/models/structure.mps
index f9d1fc100fa..f2f67c9c43e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -38,7 +38,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl
index 25afd2f2f5a..f3dc35915fb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/generator/template/main@generator.mps
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps
index 5bdea89efc0..6bf03532ab7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports />
   <registry>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl
index e94291c219c..4dfd99052e6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/generator/template/main@generator.mps
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/models/structure.mps
index 756214db55a..c0c4cd5a2ed 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -45,7 +45,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl
index eacd4e2b167..49f7c4cc64c 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/generator/template/main@generator.mps
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/models/structure.mps
index bfbbdfccb68..f87df929361 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl
index 1bfb00cd680..b61aab21cfc 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/generator/template/main@generator.mps
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/models/structure.mps
index 0cc04b13f9d..80a559b7bf0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -43,7 +43,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl
index 097aba49bad..bce359bd729 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/generator/template/main@generator.mps
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps
index 133c1461d63..4a76d9c2bda 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps
@@ -5,7 +5,7 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -81,7 +81,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl
index aee0b1c9e1f..371994f338d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,13 +54,12 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:77948de3-6ef9-452d-b392-d01403e4086f:com.mbeddr.mpsutil.ecore" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.ideaplugin/com.mbeddr.mpsutil.actionsfilter.ideaplugin.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.ideaplugin/com.mbeddr.mpsutil.actionsfilter.ideaplugin.msd
index c190b5107c7..623b3661545 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.ideaplugin/com.mbeddr.mpsutil.actionsfilter.ideaplugin.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.ideaplugin/com.mbeddr.mpsutil.actionsfilter.ideaplugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.actionsfilter.ideaplugin" uuid="c091aa8e-adbb-460a-b99f-e1a7f2242121" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.actionsfilter.ideaplugin" uuid="c091aa8e-adbb-460a-b99f-e1a7f2242121" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">436eb984-d162-4543-a347-2601ff5bb2a0(com.mbeddr.mpsutil.actionsfilter.runtime)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd
index 7aace4fa6d8..ed0d741987a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.actionsfilter.runtime" uuid="436eb984-d162-4543-a347-2601ff5bb2a0" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.actionsfilter.runtime" uuid="436eb984-d162-4543-a347-2601ff5bb2a0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -23,12 +22,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l: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: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps
index d36ee73ef2e..2e357b86d37 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:7171fd48-62d6-4c67-ab22-d7d6b8fa4653(com.mbeddr.mpsutil.actionsfilter.runtime)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -21,10 +21,8 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="mpcv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.ref(JDK/)" />
     <import index="rgfa" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.tree(JDK/)" />
-    <import index="xnls" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.icons(MPS.Platform/)" />
     <import index="obo9" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.plugins.actions(MPS.Platform/)" />
     <import index="hq8m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.options(MPS.IDEA/)" />
     <import index="mnlj" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.beans(JDK/)" />
@@ -35,11 +33,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="8fb" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.ui.customization(MPS.IDEA/)" />
-    <import index="ctgy" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.plugins(MPS.IDEA/)" />
-    <import index="69r2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.macro(MPS.IDEA/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="jlff" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.vfs(MPS.IDEA/)" />
-    <import index="4hrd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.vfs(MPS.Platform/)" />
     <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="qq04" ref="86441d7a-e194-42da-81a5-2161ec62a379/java:jetbrains.mps.ide.actions(MPS.Workbench/)" />
@@ -55,6 +49,9 @@
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
+      <concept id="7485977462274819189" name="jetbrains.mps.baseLanguage.structure.FormatOperation" flags="ng" index="2cAKMz">
+        <child id="7485977462274819664" name="arguments" index="2cAKU6" />
+      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -80,7 +77,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -237,7 +234,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -267,7 +264,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -310,6 +307,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -350,7 +348,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -472,6 +470,7 @@
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
+      <concept id="31378964227347002" name="jetbrains.mps.baseLanguage.collections.structure.SelectNotNullOperation" flags="ng" index="1KnU$U" />
       <concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
         <reference id="8293956702609966325" name="variable" index="3M$S_o" />
       </concept>
@@ -614,7 +613,7 @@
                   <node concept="3clFbF" id="2ZrHegMO5AF" role="3cqZAp">
                     <node concept="2OqwBi" id="2ZrHegMO5TI" role="3clFbG">
                       <node concept="37vLTw" id="2ZrHegMO5AE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2ZrHegMO5t2" resolve="list" />
+                        <ref role="3cqZAo" node="7chCMJ_skP8" resolve="list" />
                       </node>
                       <node concept="1aUR6E" id="2ZrHegMO7JZ" role="2OqNvi">
                         <node concept="1bVj0M" id="2ZrHegMO7K1" role="23t8la">
@@ -623,7 +622,7 @@
                               <node concept="3fqX7Q" id="2ZrHegMO7WH" role="3clFbG">
                                 <node concept="2OqwBi" id="2ZrHegMO8cG" role="3fr31v">
                                   <node concept="37vLTw" id="2ZrHegMO80O" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2ZrHegMO7K3" resolve="ra" />
+                                    <ref role="3cqZAo" node="7chCMJ_skP6" resolve="ra" />
                                   </node>
                                   <node concept="liA8E" id="2ZrHegMO9fp" role="2OqNvi">
                                     <ref role="37wK5l" node="2ZrHegMLIpW" resolve="isValid" />
@@ -632,18 +631,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2ZrHegMO7K3" role="1bW2Oz">
+                          <node concept="gl6BB" id="7chCMJ_skP6" role="1bW2Oz">
                             <property role="TrG5h" value="ra" />
-                            <node concept="2jxLKc" id="2ZrHegMO7K4" role="1tU5fm" />
+                            <node concept="2jxLKc" id="7chCMJ_skP7" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ZrHegMO5t2" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skP8" role="1bW2Oz">
                   <property role="TrG5h" value="list" />
-                  <node concept="2jxLKc" id="2ZrHegMO5t3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skP9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -667,7 +666,7 @@
                           <node concept="2OqwBi" id="2ZrHegMOoff" role="3clFbG">
                             <node concept="2OqwBi" id="2ZrHegMOmRL" role="2Oq$k0">
                               <node concept="37vLTw" id="2ZrHegMOmGZ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2ZrHegMOmxx" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPa" resolve="it" />
                               </node>
                               <node concept="3AV6Ez" id="2ZrHegMOnpv" role="2OqNvi" />
                             </node>
@@ -675,9 +674,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2ZrHegMOmxx" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skPa" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2ZrHegMOmxy" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skPb" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -688,15 +687,15 @@
                       <node concept="3clFbF" id="2ZrHegMOvme" role="3cqZAp">
                         <node concept="2OqwBi" id="2ZrHegMOvCB" role="3clFbG">
                           <node concept="37vLTw" id="2ZrHegMOvmd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ZrHegMOv59" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skPc" resolve="it" />
                           </node>
                           <node concept="3AY5_j" id="2ZrHegMOwkN" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2ZrHegMOv59" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2ZrHegMOv5a" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -713,15 +712,15 @@
                       </node>
                       <node concept="kI3uX" id="2ZrHegMO_Qd" role="2OqNvi">
                         <node concept="37vLTw" id="2ZrHegMOAbt" role="kIiFs">
-                          <ref role="3cqZAo" node="2ZrHegMOsG_" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skPe" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ZrHegMOsG_" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skPe" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ZrHegMOsGA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skPf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -820,16 +819,16 @@
                               </node>
                               <node concept="3JPx81" id="5wzRHNZwpCf" role="2OqNvi">
                                 <node concept="37vLTw" id="5wzRHNZwpCg" role="25WWJ7">
-                                  <ref role="3cqZAo" node="5wzRHNZwpCh" resolve="it" />
+                                  <ref role="3cqZAo" node="7chCMJ_skPg" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5wzRHNZwpCh" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skPg" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5wzRHNZwpCi" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skPh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -921,15 +920,15 @@
                             </node>
                             <node concept="3JPx81" id="5wzRHNZw3iS" role="2OqNvi">
                               <node concept="37vLTw" id="5wzRHNZwc9f" role="25WWJ7">
-                                <ref role="3cqZAo" node="5wzRHNZwaMt" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPi" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5wzRHNZwaMt" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skPi" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5wzRHNZwaMu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skPj" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1016,16 +1015,16 @@
                             </node>
                             <node concept="3JPx81" id="5wzRHNZx0uS" role="2OqNvi">
                               <node concept="37vLTw" id="5wzRHNZx0uT" role="25WWJ7">
-                                <ref role="3cqZAo" node="5wzRHNZx0uU" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPk" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5wzRHNZx0uU" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPk" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5wzRHNZx0uV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1056,16 +1055,16 @@
                             </node>
                             <node concept="3JPx81" id="5wzRHNZx0Qq" role="2OqNvi">
                               <node concept="37vLTw" id="5wzRHNZx0Qr" role="25WWJ7">
-                                <ref role="3cqZAo" node="5wzRHNZx0Qs" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPm" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5wzRHNZx0Qs" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPm" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5wzRHNZx0Qt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1186,7 +1185,7 @@
                             <node concept="liA8E" id="5wzRHNZBtla" role="2OqNvi">
                               <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
                               <node concept="37vLTw" id="5wzRHNZBtlb" role="37wK5m">
-                                <ref role="3cqZAo" node="5wzRHNZBtlc" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPo" resolve="it" />
                               </node>
                             </node>
                             <node concept="2YIFZM" id="3_otpeV6fXQ" role="2Oq$k0">
@@ -1197,9 +1196,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5wzRHNZBtlc" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPo" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5wzRHNZBtld" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPp" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1226,14 +1225,14 @@
                       <node concept="3y3z36" id="5wzRHNZBtli" role="3clFbG">
                         <node concept="10Nm6u" id="5wzRHNZBtlj" role="3uHU7w" />
                         <node concept="37vLTw" id="5wzRHNZBtlk" role="3uHU7B">
-                          <ref role="3cqZAo" node="5wzRHNZBtll" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skPq" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5wzRHNZBtll" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skPq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5wzRHNZBtlm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skPr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1322,7 +1321,7 @@
                           <node concept="liA8E" id="5wzRHNZC_Ko" role="2OqNvi">
                             <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
                             <node concept="37vLTw" id="5wzRHNZC_Kp" role="37wK5m">
-                              <ref role="3cqZAo" node="5wzRHNZC_Kq" resolve="it" />
+                              <ref role="3cqZAo" node="7chCMJ_skPs" resolve="it" />
                             </node>
                           </node>
                           <node concept="2YIFZM" id="3_otpeV6g5y" role="2Oq$k0">
@@ -1332,9 +1331,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5wzRHNZC_Kq" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPs" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5wzRHNZC_Kr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPt" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1346,14 +1345,14 @@
                       <node concept="3y3z36" id="5wzRHNZC_Kw" role="3clFbG">
                         <node concept="10Nm6u" id="5wzRHNZC_Kx" role="3uHU7w" />
                         <node concept="37vLTw" id="5wzRHNZC_Ky" role="3uHU7B">
-                          <ref role="3cqZAo" node="5wzRHNZC_Kz" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skPu" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5wzRHNZC_Kz" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skPu" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5wzRHNZC_K$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skPv" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1400,14 +1399,14 @@
                         <node concept="1rXfSq" id="5wzRHNZ_GZ1" role="3clFbG">
                           <ref role="37wK5l" node="5wzRHNZ$SiI" resolve="undoRemove" />
                           <node concept="37vLTw" id="3Yb7CZxPp_p" role="37wK5m">
-                            <ref role="3cqZAo" node="3Yb7CZxPplG" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skPw" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3Yb7CZxPplG" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3Yb7CZxPplH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1488,7 +1487,7 @@
                             <node concept="liA8E" id="6Y8zNs1rO6C" role="2OqNvi">
                               <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
                               <node concept="37vLTw" id="6Y8zNs1rO6D" role="37wK5m">
-                                <ref role="3cqZAo" node="6Y8zNs1rO6F" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPy" resolve="it" />
                               </node>
                             </node>
                             <node concept="2YIFZM" id="6Y8zNs1rO6E" role="2Oq$k0">
@@ -1499,9 +1498,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Y8zNs1rO6F" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPy" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Y8zNs1rO6G" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPz" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1528,14 +1527,14 @@
                       <node concept="3y3z36" id="6Y8zNs1rO6R" role="3clFbG">
                         <node concept="10Nm6u" id="6Y8zNs1rO6S" role="3uHU7w" />
                         <node concept="37vLTw" id="6Y8zNs1rO6T" role="3uHU7B">
-                          <ref role="3cqZAo" node="6Y8zNs1rO6U" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skP$" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Y8zNs1rO6U" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skP$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6Y8zNs1rO6V" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skP_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1998,7 +1997,7 @@
                     <node concept="3fqX7Q" id="2ZrHegMODY8" role="3clFbG">
                       <node concept="2OqwBi" id="2ZrHegMOEc3" role="3fr31v">
                         <node concept="37vLTw" id="2ZrHegMOE52" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2ZrHegMODMr" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skPA" resolve="it" />
                         </node>
                         <node concept="liA8E" id="2ZrHegMOECH" role="2OqNvi">
                           <ref role="37wK5l" node="2ZrHegMLIpW" resolve="isValid" />
@@ -2007,9 +2006,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ZrHegMODMr" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skPA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ZrHegMODMs" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skPB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2259,15 +2258,15 @@
                               </node>
                               <node concept="3JPx81" id="4ph9euf354o" role="2OqNvi">
                                 <node concept="37vLTw" id="4ph9euf35fX" role="25WWJ7">
-                                  <ref role="3cqZAo" node="4ph9euf33cp" resolve="it" />
+                                  <ref role="3cqZAo" node="7chCMJ_skPC" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4ph9euf33cp" role="1bW2Oz">
+                        <node concept="gl6BB" id="7chCMJ_skPC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4ph9euf33cq" role="1tU5fm" />
+                          <node concept="2jxLKc" id="7chCMJ_skPD" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2307,15 +2306,15 @@
                               </node>
                               <node concept="3JPx81" id="4ph9euf36kM" role="2OqNvi">
                                 <node concept="37vLTw" id="4ph9euf36kN" role="25WWJ7">
-                                  <ref role="3cqZAo" node="4ph9euf36kO" resolve="it" />
+                                  <ref role="3cqZAo" node="7chCMJ_skPE" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4ph9euf36kO" role="1bW2Oz">
+                        <node concept="gl6BB" id="7chCMJ_skPE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4ph9euf36kP" role="1tU5fm" />
+                          <node concept="2jxLKc" id="7chCMJ_skPF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2732,13 +2731,13 @@
                     <node concept="3clFbS" id="5XF9c009zv8" role="1bW5cS">
                       <node concept="3clFbF" id="5XF9c009zBC" role="3cqZAp">
                         <node concept="37vLTw" id="5XF9c009zBB" role="3clFbG">
-                          <ref role="3cqZAo" node="5XF9c009zv9" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skPG" resolve="it" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5XF9c009zv9" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPG" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5XF9c009zva" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPH" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2749,7 +2748,7 @@
                     <node concept="3clFbF" id="1g_orKJEOGs" role="3cqZAp">
                       <node concept="2OqwBi" id="1g_orKJEOP$" role="3clFbG">
                         <node concept="37vLTw" id="1g_orKJEOGr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1g_orKJEOum" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skPI" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1g_orKJEQUA" role="2OqNvi">
                           <ref role="37wK5l" node="2ZrHegMLIpW" resolve="isValid" />
@@ -2757,9 +2756,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1g_orKJEOum" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skPI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1g_orKJEOun" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skPJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2774,7 +2773,7 @@
                       </node>
                       <node concept="2OqwBi" id="5XF9c009BOE" role="3uHU7B">
                         <node concept="37vLTw" id="5XF9c009BHz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5XF9c009ByE" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skPK" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5XF9c009DTk" role="2OqNvi">
                           <ref role="37wK5l" node="2ZrHegMMr2o" resolve="getParent" />
@@ -2783,9 +2782,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5XF9c009ByE" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skPK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5XF9c009ByF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skPL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2888,7 +2887,7 @@
                             <node concept="1pGfFk" id="2ZrHegMM9H9" role="2ShVmc">
                               <ref role="37wK5l" to="mpcv:~WeakReference.&lt;init&gt;(java.lang.Object)" resolve="WeakReference" />
                               <node concept="37vLTw" id="2ZrHegMM9Ra" role="37wK5m">
-                                <ref role="3cqZAo" node="2ZrHegMLRQ_" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPM" resolve="it" />
                               </node>
                               <node concept="3uibUv" id="2ZrHegMMbCi" role="1pMfVU">
                                 <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
@@ -2897,9 +2896,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2ZrHegMLRQ_" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skPM" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2ZrHegMLRQA" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skPN" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2929,15 +2928,15 @@
                                 <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
                               </node>
                               <node concept="37vLTw" id="2ZrHegMMeAv" role="37wK5m">
-                                <ref role="3cqZAo" node="2ZrHegMMdCR" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skPO" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2ZrHegMMdCR" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skPO" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2ZrHegMMdCS" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skPP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3071,7 +3070,7 @@
                         <node concept="3clFbF" id="2ZrHegMM_Y8" role="3cqZAp">
                           <node concept="2OqwBi" id="2ZrHegMMA7Q" role="3clFbG">
                             <node concept="37vLTw" id="2ZrHegMM_Y7" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2ZrHegMM_NW" resolve="it" />
+                              <ref role="3cqZAo" node="7chCMJ_skPQ" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2ZrHegMMB58" role="2OqNvi">
                               <ref role="37wK5l" to="mpcv:~Reference.get()" resolve="get" />
@@ -3079,9 +3078,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2ZrHegMM_NW" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skPQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2ZrHegMM_NX" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skPR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3093,14 +3092,14 @@
                         <node concept="3y3z36" id="2ZrHegMMDdW" role="3clFbG">
                           <node concept="10Nm6u" id="2ZrHegMMDpR" role="3uHU7w" />
                           <node concept="37vLTw" id="2ZrHegMMCYl" role="3uHU7B">
-                            <ref role="3cqZAo" node="2ZrHegMMCKZ" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skPS" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2ZrHegMMCKZ" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2ZrHegMMCL0" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3133,7 +3132,7 @@
                         <node concept="3clFbF" id="2ZrHegMMFmI" role="3cqZAp">
                           <node concept="2OqwBi" id="2ZrHegMMFmJ" role="3clFbG">
                             <node concept="37vLTw" id="2ZrHegMMFmK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2ZrHegMMFmM" resolve="it" />
+                              <ref role="3cqZAo" node="7chCMJ_skPU" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2ZrHegMMFmL" role="2OqNvi">
                               <ref role="37wK5l" to="mpcv:~Reference.get()" resolve="get" />
@@ -3141,9 +3140,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2ZrHegMMFmM" role="1bW2Oz">
+                      <node concept="gl6BB" id="7chCMJ_skPU" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2ZrHegMMFmN" role="1tU5fm" />
+                        <node concept="2jxLKc" id="7chCMJ_skPV" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3155,14 +3154,14 @@
                         <node concept="3y3z36" id="2ZrHegMMFmS" role="3clFbG">
                           <node concept="10Nm6u" id="2ZrHegMMFmT" role="3uHU7w" />
                           <node concept="37vLTw" id="2ZrHegMMFmU" role="3uHU7B">
-                            <ref role="3cqZAo" node="2ZrHegMMFmV" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skPW" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2ZrHegMMFmV" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2ZrHegMMFmW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skPX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3506,21 +3505,6 @@
   <node concept="312cEu" id="4JPDo_GOOui">
     <property role="TrG5h" value="ActionHacks" />
     <property role="3GE5qa" value="actionfilter" />
-    <node concept="Wx3nA" id="4JPDo_GQwGg" role="jymVt">
-      <property role="TrG5h" value="LOG" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3uibUv" id="4JPDo_GQt0Z" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
-      </node>
-      <node concept="3Tm6S6" id="4JPDo_GQsba" role="1B3o_S" />
-      <node concept="2YIFZM" id="4JPDo_GQwCn" role="33vP2m">
-        <ref role="37wK5l" to="q7tw:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
-        <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-        <node concept="3VsKOn" id="4JPDo_GQwDT" role="37wK5m">
-          <ref role="3VsUkX" node="4JPDo_GOOui" resolve="ActionHacks" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="4JPDo_GQrrt" role="jymVt" />
     <node concept="2YIFZL" id="4EB7X9kjcFN" role="jymVt">
       <property role="TrG5h" value="getActionsById" />
@@ -3546,37 +3530,20 @@
                           <node concept="liA8E" id="4EB7X9kjgIC" role="2OqNvi">
                             <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
                             <node concept="37vLTw" id="4EB7X9kjgID" role="37wK5m">
-                              <ref role="3cqZAo" node="4EB7X9kjgIE" resolve="id" />
+                              <ref role="3cqZAo" node="7chCMJ_skPY" resolve="id" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4EB7X9kjgIE" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skPY" role="1bW2Oz">
                       <property role="TrG5h" value="id" />
-                      <node concept="2jxLKc" id="4EB7X9kjgIF" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3zZkjj" id="4EB7X9kjgIG" role="2OqNvi">
-                <node concept="1bVj0M" id="4EB7X9kjgIH" role="23t8la">
-                  <node concept="3clFbS" id="4EB7X9kjgII" role="1bW5cS">
-                    <node concept="3clFbF" id="4EB7X9kjgIJ" role="3cqZAp">
-                      <node concept="3y3z36" id="4EB7X9kjgIK" role="3clFbG">
-                        <node concept="10Nm6u" id="4EB7X9kjgIL" role="3uHU7w" />
-                        <node concept="37vLTw" id="4EB7X9kjgIM" role="3uHU7B">
-                          <ref role="3cqZAo" node="4EB7X9kjgIN" resolve="it" />
-                        </node>
-                      </node>
+                      <node concept="2jxLKc" id="7chCMJ_skPZ" role="1tU5fm" />
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4EB7X9kjgIN" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4EB7X9kjgIO" role="1tU5fm" />
-                  </node>
                 </node>
               </node>
+              <node concept="1KnU$U" id="1Ch_cEfGkIC" role="2OqNvi" />
             </node>
             <node concept="ANE8D" id="4EB7X9kjgIP" role="2OqNvi" />
           </node>
@@ -4175,13 +4142,13 @@
                   <node concept="3clFbS" id="4JPDo_GS320" role="1bW5cS">
                     <node concept="3clFbF" id="4JPDo_GS3eR" role="3cqZAp">
                       <node concept="37vLTw" id="4JPDo_GS3eQ" role="3clFbG">
-                        <ref role="3cqZAo" node="4JPDo_GS321" resolve="it" />
+                        <ref role="3cqZAo" node="7chCMJ_skQ0" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4JPDo_GS321" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skQ0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4JPDo_GS322" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skQ1" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="4JPDo_GS323" role="2S7zOq">
@@ -4234,15 +4201,15 @@
                         <node concept="liA8E" id="4JPDo_GSEN2" role="2OqNvi">
                           <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
                           <node concept="37vLTw" id="4JPDo_GSESx" role="37wK5m">
-                            <ref role="3cqZAo" node="4JPDo_GSE9T" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skQ2" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4JPDo_GSE9T" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skQ2" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4JPDo_GSE9U" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skQ3" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4669,7 +4636,7 @@
                           <node concept="10Nm6u" id="4EB7X9kkBtP" role="3uHU7w" />
                           <node concept="3EllGN" id="4EB7X9kkB5o" role="3uHU7B">
                             <node concept="37vLTw" id="4EB7X9kkBfy" role="3ElVtu">
-                              <ref role="3cqZAo" node="4EB7X9kkABu" resolve="it" />
+                              <ref role="3cqZAo" node="7chCMJ_skQ4" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="4EB7X9kkAIC" role="3ElQJh">
                               <ref role="3cqZAo" node="4EB7X9kkobC" resolve="parents" />
@@ -4678,9 +4645,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4EB7X9kkABu" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skQ4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4EB7X9kkABv" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skQ5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4698,16 +4665,16 @@
                           <node concept="liA8E" id="4EB7X9kkFs6" role="2OqNvi">
                             <ref role="37wK5l" to="qkt:~ActionManager.getId(com.intellij.openapi.actionSystem.AnAction)" resolve="getId" />
                             <node concept="37vLTw" id="4EB7X9kkFBY" role="37wK5m">
-                              <ref role="3cqZAo" node="4EB7X9kkDS5" resolve="it" />
+                              <ref role="3cqZAo" node="7chCMJ_skQ6" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4EB7X9kkDS5" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skQ6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4EB7X9kkDS6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skQ7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6059,15 +6026,15 @@
                                 <node concept="liA8E" id="3NH93czv7RY" role="2OqNvi">
                                   <ref role="37wK5l" to="dxuu:~DefaultComboBoxModel.addElement(java.lang.Object)" resolve="addElement" />
                                   <node concept="37vLTw" id="3NH93czv81$" role="37wK5m">
-                                    <ref role="3cqZAo" node="3NH93czv6VW" resolve="it" />
+                                    <ref role="3cqZAo" node="7chCMJ_skQ8" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3NH93czv6VW" role="1bW2Oz">
+                          <node concept="gl6BB" id="7chCMJ_skQ8" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3NH93czv6VX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="7chCMJ_skQ9" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -7808,7 +7775,7 @@
                       <node concept="1rXfSq" id="3wU63TvfYv2" role="3clFbG">
                         <ref role="37wK5l" node="3wU63TvfQzF" resolve="matches" />
                         <node concept="37vLTw" id="3wU63TvfYH7" role="37wK5m">
-                          <ref role="3cqZAo" node="3wU63TvfMQc" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skQa" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="3wU63TvfYSy" role="37wK5m">
                           <ref role="3cqZAo" node="3wU63Tvft9Q" resolve="text" />
@@ -7816,9 +7783,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3wU63TvfMQc" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skQa" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3wU63TvfMQd" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skQb" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9379,7 +9346,7 @@
                     <node concept="3clFbF" id="1_Ri$6x_4Wi" role="3cqZAp">
                       <node concept="2OqwBi" id="1_Ri$6x_53c" role="3clFbG">
                         <node concept="37vLTw" id="1_Ri$6x_4Wh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1_Ri$6x_4Pv" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skQc" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1_Ri$6x_5$z" role="2OqNvi">
                           <ref role="37wK5l" node="3NH93czhwCT" resolve="clone" />
@@ -9387,9 +9354,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1_Ri$6x_4Pv" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skQc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1_Ri$6x_4Pw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skQd" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9490,6 +9457,7 @@
     <node concept="2tJIrI" id="2ZrHegMYtNF" role="jymVt" />
     <node concept="312cEg" id="61pZq5SvuY2" role="jymVt">
       <property role="TrG5h" value="myFilteredIds" />
+      <node concept="3Tm1VV" id="5KoJxDfaHvY" role="1B3o_S" />
       <node concept="2hMVRd" id="61pZq5SvFA$" role="1tU5fm">
         <node concept="17QB3L" id="61pZq5SvFAA" role="2hN53Y" />
       </node>
@@ -9498,7 +9466,6 @@
           <node concept="17QB3L" id="6RnZMKPH3y$" role="HW$YZ" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHvY" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="2ZrHegMYvTj" role="jymVt" />
     <node concept="3clFb_" id="61pZq5Svvw3" role="jymVt">
@@ -9976,6 +9943,7 @@
     <node concept="2tJIrI" id="3NH93cztXk5" role="jymVt" />
     <node concept="312cEg" id="3NH93czh8ub" role="jymVt">
       <property role="TrG5h" value="myProfiles" />
+      <node concept="3Tm1VV" id="49xzmIMxBgp" role="1B3o_S" />
       <node concept="_YKpA" id="3NH93czh8u$" role="1tU5fm">
         <node concept="3uibUv" id="3NH93czh8uS" role="_ZDj9">
           <ref role="3uigEE" node="3NH93czfhb6" resolve="Profile" />
@@ -9988,7 +9956,6 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="49xzmIMxBgp" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3NH93czh8vD" role="jymVt">
       <property role="TrG5h" value="myActiveProfileIndex" />
@@ -10001,10 +9968,10 @@
     <node concept="312cEg" id="3NH93cztr9T" role="jymVt">
       <property role="TrG5h" value="myPropertyChangeSupport" />
       <property role="eg7rD" value="true" />
+      <node concept="3Tm1VV" id="5KoJxDfaHwj" role="1B3o_S" />
       <node concept="3uibUv" id="3NH93cztsf$" role="1tU5fm">
         <ref role="3uigEE" to="mnlj:~PropertyChangeSupport" resolve="PropertyChangeSupport" />
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHwj" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3NH93czh8x8" role="jymVt" />
     <node concept="3clFbW" id="3NH93czhh96" role="jymVt">
@@ -10676,7 +10643,7 @@
                               </node>
                               <node concept="2OqwBi" id="1_Ri$6x$6o5" role="3uHU7B">
                                 <node concept="37vLTw" id="1_Ri$6x$6o6" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1_Ri$6x$6o8" resolve="it" />
+                                  <ref role="3cqZAo" node="7chCMJ_skQg" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="1_Ri$6x$6o7" role="2OqNvi">
                                   <ref role="37wK5l" node="3NH93czh2D0" resolve="getName" />
@@ -10685,9 +10652,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1_Ri$6x$6o8" role="1bW2Oz">
+                        <node concept="gl6BB" id="7chCMJ_skQg" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1_Ri$6x$6o9" role="1tU5fm" />
+                          <node concept="2jxLKc" id="7chCMJ_skQh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -11090,7 +11057,7 @@
                       <node concept="3clFbF" id="3NH93czuBIo" role="3cqZAp">
                         <node concept="2OqwBi" id="3NH93czuBOe" role="3clFbG">
                           <node concept="37vLTw" id="3NH93czuBIn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3NH93czuBAf" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skQi" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3NH93czuCcn" role="2OqNvi">
                             <ref role="37wK5l" node="3NH93czhwCT" resolve="clone" />
@@ -11098,9 +11065,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3NH93czuBAf" role="1bW2Oz">
+                    <node concept="gl6BB" id="7chCMJ_skQi" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3NH93czuBAg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7chCMJ_skQj" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -11163,7 +11130,7 @@
                           <node concept="3clFbF" id="3NH93czhAVK" role="3cqZAp">
                             <node concept="2OqwBi" id="3NH93czhB3e" role="3clFbG">
                               <node concept="37vLTw" id="3NH93czhAVJ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3NH93czhANw" resolve="it" />
+                                <ref role="3cqZAo" node="7chCMJ_skQk" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3NH93czhBA6" role="2OqNvi">
                                 <ref role="37wK5l" node="3NH93czhwCT" resolve="clone" />
@@ -11171,9 +11138,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3NH93czhANw" role="1bW2Oz">
+                        <node concept="gl6BB" id="7chCMJ_skQk" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3NH93czhANx" role="1tU5fm" />
+                          <node concept="2jxLKc" id="7chCMJ_skQl" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -11509,6 +11476,7 @@
     <node concept="2tJIrI" id="3NH93czfhC8" role="jymVt" />
     <node concept="312cEg" id="3NH93czwMuj" role="jymVt">
       <property role="TrG5h" value="myId" />
+      <node concept="3Tm1VV" id="5KoJxDfaHw1" role="1B3o_S" />
       <node concept="17QB3L" id="3NH93czwMTL" role="1tU5fm" />
       <node concept="2OqwBi" id="3NH93czwNfi" role="33vP2m">
         <node concept="2YIFZM" id="3NH93czwN1H" role="2Oq$k0">
@@ -11519,10 +11487,10 @@
           <ref role="37wK5l" to="33ny:~UUID.toString()" resolve="toString" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHw1" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3NH93czfhCw" role="jymVt">
       <property role="TrG5h" value="myName" />
+      <node concept="3Tm1VV" id="5KoJxDfaHw4" role="1B3o_S" />
       <node concept="17QB3L" id="3NH93czfhCQ" role="1tU5fm" />
       <node concept="Xl_RD" id="3NH93czh3Cc" role="33vP2m">
         <property role="Xl_RC" value="&lt;no name&gt;" />
@@ -11530,10 +11498,10 @@
       <node concept="2AHcQZ" id="3NH93czh3CX" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHw4" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3NH93czgEWC" role="jymVt">
       <property role="TrG5h" value="filterSettings" />
+      <node concept="3Tm1VV" id="5KoJxDfaHw7" role="1B3o_S" />
       <node concept="3uibUv" id="3NH93czgEXi" role="1tU5fm">
         <ref role="3uigEE" node="2ZrHegMYtMW" resolve="FilterSettings" />
       </node>
@@ -11545,40 +11513,39 @@
       <node concept="2AHcQZ" id="3NH93czh3En" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHw7" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="49MflvOOHeK" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="toolbarSettings" />
       <property role="3TUv4t" value="false" />
+      <node concept="3Tm1VV" id="5KoJxDfaHwa" role="1B3o_S" />
       <node concept="3uibUv" id="49MflvOOH3Z" role="1tU5fm">
         <ref role="3uigEE" node="1Csv4JJJ_wN" resolve="ToolbarSettings" />
       </node>
       <node concept="2AHcQZ" id="49MflvOOZqI" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHwa" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="49MflvOOZMG" role="jymVt" />
     <node concept="312cEg" id="1_Ri$6xA3J3" role="jymVt">
       <property role="TrG5h" value="myIsPredefined" />
+      <node concept="3Tm1VV" id="5KoJxDfaHwd" role="1B3o_S" />
       <node concept="10P_77" id="1_Ri$6xA4bB" role="1tU5fm" />
       <node concept="3clFbT" id="1_Ri$6xA4k_" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHwd" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="2y5$DYCdCyT" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="myIsActiveByDefault" />
       <property role="3TUv4t" value="false" />
+      <node concept="3Tm1VV" id="5KoJxDfaHwg" role="1B3o_S" />
       <node concept="10P_77" id="2y5$DYCdCxi" role="1tU5fm" />
       <node concept="3clFbT" id="2y5$DYCdD2Q" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaHwg" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="7zBzSouMwxo" role="jymVt">
       <property role="TrG5h" value="myDefaultPriority" />
@@ -13111,6 +13078,7 @@
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="toolBarEntries" />
       <property role="3TUv4t" value="false" />
+      <node concept="3Tm1VV" id="5KoJxDfaMTS" role="1B3o_S" />
       <node concept="_YKpA" id="49MflvORO7i" role="1tU5fm">
         <node concept="3uibUv" id="3m_Gngis8jM" role="_ZDj9">
           <ref role="3uigEE" node="3m_GngirHvL" resolve="ToolBarEntry" />
@@ -13123,7 +13091,6 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="5KoJxDfaMTS" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3SW7dV3AZKC" role="jymVt" />
     <node concept="3clFbW" id="3SW7dV3B39k" role="jymVt">
@@ -13285,6 +13252,7 @@
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="entries" />
       <property role="3TUv4t" value="false" />
+      <node concept="3Tm1VV" id="3SW7dV3AZb3" role="1B3o_S" />
       <node concept="_YKpA" id="2D4mVfzuQGh" role="1tU5fm">
         <node concept="3uibUv" id="2D4mVfzuSOI" role="_ZDj9">
           <ref role="3uigEE" node="3m_GngirHvL" resolve="ToolBarEntry" />
@@ -13297,7 +13265,6 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="3SW7dV3AZb3" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="4I$o2ar2tOY" role="jymVt" />
     <node concept="312cEg" id="7GYIME_ncRu" role="jymVt">
@@ -13310,6 +13277,7 @@
           <ref role="3uigEE" node="3m_GngirHvL" resolve="ToolBarEntry" />
         </node>
       </node>
+      <node concept="3Tm1VV" id="3SW7dV3AZb6" role="1B3o_S" />
       <node concept="2ShNRf" id="7GYIME_neJG" role="33vP2m">
         <node concept="Tc6Ow" id="7GYIME_mYbB" role="2ShVmc">
           <node concept="3uibUv" id="7GYIME_mYbC" role="HW$YZ">
@@ -13317,7 +13285,6 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="3SW7dV3AZb6" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="54oLeKi_hme" role="jymVt" />
     <node concept="2YIFZL" id="1IyFrIF4lWQ" role="jymVt">
@@ -13380,7 +13347,7 @@
                   <node concept="3clFbJ" id="7GYIME_nfyS" role="3cqZAp">
                     <node concept="2OqwBi" id="7GYIME_ngbR" role="3clFbw">
                       <node concept="37vLTw" id="7GYIME_nfHb" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7GYIME_ncME" resolve="it" />
+                        <ref role="3cqZAo" node="7chCMJ_skQm" resolve="it" />
                       </node>
                       <node concept="17RvpY" id="7GYIME_ngz_" role="2OqNvi" />
                     </node>
@@ -13395,7 +13362,7 @@
                               <node concept="1pGfFk" id="7GYIME_nlQ0" role="2ShVmc">
                                 <ref role="37wK5l" node="3m_Gngis2ZL" resolve="ToolBarEntry" />
                                 <node concept="37vLTw" id="7GYIME_nm7s" role="37wK5m">
-                                  <ref role="3cqZAo" node="7GYIME_ncME" resolve="it" />
+                                  <ref role="3cqZAo" node="7chCMJ_skQm" resolve="it" />
                                 </node>
                                 <node concept="10Nm6u" id="7GYIME_nmqo" role="37wK5m" />
                                 <node concept="Rm8GO" id="7GYIME_no12" role="37wK5m">
@@ -13432,9 +13399,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7GYIME_ncME" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skQm" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7GYIME_ncMF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skQn" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -13675,7 +13642,7 @@
                           <node concept="17QB3L" id="7jxV$rv3ZGI" role="1tU5fm" />
                           <node concept="2OqwBi" id="7jxV$rv40Lm" role="33vP2m">
                             <node concept="37vLTw" id="7jxV$rv40pE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                              <ref role="3cqZAo" node="7chCMJ_skQo" resolve="entry" />
                             </node>
                             <node concept="liA8E" id="7jxV$rv410E" role="2OqNvi">
                               <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
@@ -13697,7 +13664,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="7jxV$rv46U0" role="3uHU7w">
                                   <node concept="37vLTw" id="7jxV$rv46qX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                                    <ref role="3cqZAo" node="7chCMJ_skQo" resolve="entry" />
                                   </node>
                                   <node concept="liA8E" id="7jxV$rv47k3" role="2OqNvi">
                                     <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -13708,10 +13675,10 @@
                           </node>
                         </node>
                         <node concept="2OqwBi" id="7jxV$rv43vU" role="3clFbw">
+                          <node concept="17RlXB" id="7jxV$rv442k" role="2OqNvi" />
                           <node concept="37vLTw" id="7jxV$rv42W7" role="2Oq$k0">
                             <ref role="3cqZAo" node="7jxV$rv3ZGN" resolve="actionId" />
                           </node>
-                          <node concept="17RlXB" id="7jxV$rv442k" role="2OqNvi" />
                         </node>
                         <node concept="9aQIb" id="7jxV$rv48OI" role="9aQIa">
                           <node concept="3clFbS" id="7jxV$rv48OJ" role="9aQI4">
@@ -13787,7 +13754,7 @@
                                             <ref role="37wK5l" to="8fb:~CustomActionsSchema.addIconCustomization(java.lang.String,java.lang.String)" resolve="addIconCustomization" />
                                             <node concept="2OqwBi" id="59JBFovnNcg" role="37wK5m">
                                               <node concept="37vLTw" id="59JBFovnMmy" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                                                <ref role="3cqZAo" node="7chCMJ_skQo" resolve="entry" />
                                               </node>
                                               <node concept="liA8E" id="59JBFovnO5U" role="2OqNvi">
                                                 <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
@@ -13795,7 +13762,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="59JBFovnQzf" role="37wK5m">
                                               <node concept="37vLTw" id="59JBFovnPL1" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                                                <ref role="3cqZAo" node="7chCMJ_skQo" resolve="entry" />
                                               </node>
                                               <node concept="liA8E" id="59JBFovnRnU" role="2OqNvi">
                                                 <ref role="37wK5l" node="6F5AXb8IsjZ" resolve="getIconPath" />
@@ -13808,7 +13775,7 @@
                                     <node concept="2OqwBi" id="fi1uEptFWy" role="3clFbw">
                                       <node concept="2OqwBi" id="fi1uEptEX0" role="2Oq$k0">
                                         <node concept="37vLTw" id="fi1uEptE$F" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                                          <ref role="3cqZAo" node="7chCMJ_skQo" resolve="entry" />
                                         </node>
                                         <node concept="liA8E" id="fi1uEptFgc" role="2OqNvi">
                                           <ref role="37wK5l" node="6F5AXb8IsjZ" resolve="getIconPath" />
@@ -13827,7 +13794,7 @@
                     <node concept="2OqwBi" id="2D4mVfzvU43" role="3clFbw">
                       <node concept="2OqwBi" id="2D4mVfzvU44" role="2Oq$k0">
                         <node concept="37vLTw" id="2D4mVfzvU45" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                          <ref role="3cqZAo" node="7chCMJ_skQo" resolve="entry" />
                         </node>
                         <node concept="liA8E" id="2D4mVfzvU46" role="2OqNvi">
                           <ref role="37wK5l" node="3m_Gngis0l4" resolve="getEntryType" />
@@ -13862,9 +13829,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2D4mVfzvU4h" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skQo" role="1bW2Oz">
                   <property role="TrG5h" value="entry" />
-                  <node concept="2jxLKc" id="2D4mVfzvU4i" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skQp" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -13966,7 +13933,7 @@
                       <node concept="2OqwBi" id="5s3J1p6pd8z" role="3clFbG">
                         <node concept="2OqwBi" id="5s3J1p6pamO" role="2Oq$k0">
                           <node concept="37vLTw" id="5s3J1p6p9Jf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5s3J1p6p8fc" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skQq" resolve="it" />
                           </node>
                           <node concept="liA8E" id="1Y41B6dwtts" role="2OqNvi">
                             <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
@@ -13976,9 +13943,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5s3J1p6p8fc" role="1bW2Oz">
+                  <node concept="gl6BB" id="7chCMJ_skQq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5s3J1p6p8fd" role="1tU5fm" />
+                    <node concept="2jxLKc" id="7chCMJ_skQr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -13995,7 +13962,7 @@
                         <ref role="37wK5l" to="8fb:~CustomActionsSchema.removeIconCustomization(java.lang.String)" resolve="removeIconCustomization" />
                         <node concept="2OqwBi" id="fi1uEpw8tQ" role="37wK5m">
                           <node concept="37vLTw" id="fi1uEpw8av" role="2Oq$k0">
-                            <ref role="3cqZAo" node="fi1uEpw6$z" resolve="it" />
+                            <ref role="3cqZAo" node="7chCMJ_skQs" resolve="it" />
                           </node>
                           <node concept="liA8E" id="fi1uEpw8IL" role="2OqNvi">
                             <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
@@ -14005,9 +13972,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="fi1uEpw6$z" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skQs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="fi1uEpw6$$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skQt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14080,15 +14047,15 @@
                       <node concept="liA8E" id="7GYIME_o7Lm" role="2OqNvi">
                         <ref role="37wK5l" to="qkt:~ActionManager.getId(com.intellij.openapi.actionSystem.AnAction)" resolve="getId" />
                         <node concept="37vLTw" id="7GYIME_o7Ln" role="37wK5m">
-                          <ref role="3cqZAo" node="7GYIME_o7Lo" resolve="it" />
+                          <ref role="3cqZAo" node="7chCMJ_skQu" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7GYIME_o7Lo" role="1bW2Oz">
+                <node concept="gl6BB" id="7chCMJ_skQu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7GYIME_o7Lp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="7chCMJ_skQv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14117,24 +14084,6 @@
     <property role="3GE5qa" value="toolbar" />
     <property role="TrG5h" value="ToolBarEntry" />
     <property role="1sVAO0" value="false" />
-    <node concept="2tJIrI" id="3m_GngirHwP" role="jymVt" />
-    <node concept="312cEg" id="5Q7oI4iRbSV" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="logger" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="5Q7oI4iRbvi" role="1B3o_S" />
-      <node concept="3uibUv" id="5Q7oI4iRbSN" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
-      </node>
-      <node concept="2YIFZM" id="5Q7oI4iRc$e" role="33vP2m">
-        <ref role="37wK5l" to="q7tw:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
-        <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-        <node concept="3VsKOn" id="5Q7oI4iRcLG" role="37wK5m">
-          <ref role="3VsUkX" node="3m_GngirHvL" resolve="ToolBarEntry" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="5Q7oI4iRb6c" role="jymVt" />
     <node concept="Qs71p" id="3m_GngirLka" role="jymVt">
       <property role="2bfB8j" value="true" />
@@ -14253,35 +14202,35 @@
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="entryType" />
       <property role="3TUv4t" value="false" />
+      <node concept="3Tm1VV" id="67WVzZmonpY" role="1B3o_S" />
       <node concept="3uibUv" id="3m_GngirZL7" role="1tU5fm">
         <ref role="3uigEE" node="3m_GngirLka" resolve="ToolBarEntry.EntryType" />
       </node>
       <node concept="2AHcQZ" id="3m_Gngitw6q" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
-      <node concept="3Tm1VV" id="67WVzZmonpY" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3m_GngirH_J" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="actionID" />
       <property role="3TUv4t" value="false" />
+      <node concept="3Tm1VV" id="67WVzZmonq1" role="1B3o_S" />
       <node concept="17QB3L" id="3m_GngirH_D" role="1tU5fm" />
       <node concept="2AHcQZ" id="3m_GngirHEg" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
-      <node concept="3Tm1VV" id="67WVzZmonq1" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3m_GngirHG0" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="icon" />
       <property role="3TUv4t" value="false" />
+      <node concept="3Tm1VV" id="67WVzZmonq4" role="1B3o_S" />
       <node concept="17QB3L" id="3m_GngirHE9" role="1tU5fm" />
       <node concept="2AHcQZ" id="3m_GngirHGl" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
-      <node concept="3Tm1VV" id="67WVzZmonq4" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3m_GngirHx6" role="jymVt" />
     <node concept="3clFb_" id="3m_Gngis0l4" role="jymVt">
@@ -14476,39 +14425,18 @@
         </node>
         <node concept="3clFbJ" id="6F5AXb8Krq0" role="3cqZAp">
           <node concept="3clFbS" id="6F5AXb8Krq2" role="3clFbx">
-            <node concept="3clFbF" id="5Q7oI4iRdo_" role="3cqZAp">
-              <node concept="2OqwBi" id="5Q7oI4iRe2C" role="3clFbG">
-                <node concept="37vLTw" id="5Q7oI4iRdoz" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Q7oI4iRbSV" resolve="logger" />
-                </node>
-                <node concept="liA8E" id="5Q7oI4iRemX" role="2OqNvi">
-                  <ref role="37wK5l" to="q7tw:~Category.log(org.apache.log4j.Priority,java.lang.Object)" resolve="log" />
-                  <node concept="10M0yZ" id="5Q7oI4iReP8" role="37wK5m">
-                    <ref role="3cqZAo" to="q7tw:~Priority.WARN" resolve="WARN" />
-                    <ref role="1PxDUh" to="q7tw:~Priority" resolve="Priority" />
-                  </node>
-                  <node concept="3cpWs3" id="5Q7oI4iRfou" role="37wK5m">
-                    <node concept="Xl_RD" id="5Q7oI4iRfov" role="3uHU7w">
-                      <property role="Xl_RC" value="]" />
-                    </node>
-                    <node concept="3cpWs3" id="5Q7oI4iRfow" role="3uHU7B">
-                      <node concept="3cpWs3" id="5Q7oI4iRfox" role="3uHU7B">
-                        <node concept="3cpWs3" id="5Q7oI4iRfoy" role="3uHU7B">
-                          <node concept="Xl_RD" id="5Q7oI4iRfoz" role="3uHU7B">
-                            <property role="Xl_RC" value="Could not find icon [" />
-                          </node>
-                          <node concept="37vLTw" id="5Q7oI4iRfo$" role="3uHU7w">
-                            <ref role="3cqZAo" node="3m_GngirHG0" resolve="icon" />
-                          </node>
-                        </node>
-                        <node concept="Xl_RD" id="5Q7oI4iRfo_" role="3uHU7w">
-                          <property role="Xl_RC" value="] for action [" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="5Q7oI4iRfoA" role="3uHU7w">
-                        <ref role="3cqZAo" node="3m_GngirH_J" resolve="actionID" />
-                      </node>
-                    </node>
+            <node concept="RRSsy" id="1Ch_cEfGwIV" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fksE/warn" />
+              <node concept="2OqwBi" id="1Ch_cEfGzYr" role="RRSoy">
+                <node concept="Xl_RD" id="1Ch_cEfGzYs" role="2Oq$k0">
+                  <property role="Xl_RC" value="Could not find icon [%s] for action [%s]" />
+                </node>
+                <node concept="2cAKMz" id="1Ch_cEfGzYt" role="2OqNvi">
+                  <node concept="37vLTw" id="5Q7oI4iRfo$" role="2cAKU6">
+                    <ref role="3cqZAo" node="3m_GngirHG0" resolve="icon" />
+                  </node>
+                  <node concept="37vLTw" id="5Q7oI4iRfoA" role="2cAKU6">
+                    <ref role="3cqZAo" node="3m_GngirH_J" resolve="actionID" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/com.mbeddr.mpsutil.asynccell.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/com.mbeddr.mpsutil.asynccell.msd
index 17c7cca6004..fc249239b5c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/com.mbeddr.mpsutil.asynccell.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/com.mbeddr.mpsutil.asynccell.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.asynccell" uuid="0381a253-2986-4e29-bd38-bdda504095e5" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.asynccell" uuid="0381a253-2986-4e29-bd38-bdda504095e5" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -22,12 +21,12 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps
index daf0f890b8c..6b5286f12ed 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps
@@ -6,7 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
   </languages>
@@ -56,7 +56,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -162,7 +162,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -190,7 +190,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1170075670744" name="jetbrains.mps.baseLanguage.structure.SynchronizedStatement" flags="nn" index="1HWtB8">
@@ -263,7 +263,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/com.mbeddr.mpsutil.buildassistant.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/com.mbeddr.mpsutil.buildassistant.msd
index 01346e8efa9..76948271d2f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/com.mbeddr.mpsutil.buildassistant.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/com.mbeddr.mpsutil.buildassistant.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.buildassistant" uuid="e318c06d-39ac-4441-8404-c31555c7ca50" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.buildassistant" uuid="e318c06d-39ac-4441-8404-c31555c7ca50" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -28,10 +27,10 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps
index 7f8c6608493..8fe85f27bf9 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
@@ -19,7 +19,6 @@
     <import index="afa5" ref="r:cfccec82-df72-4483-9807-88776b4673ab(jetbrains.mps.ide.make.actions)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
@@ -29,6 +28,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="ap4t" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator(MPS.Generator/)" />
+    <import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
     <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" implicit="true" />
     <import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" implicit="true" />
   </imports>
@@ -41,6 +41,7 @@
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -51,7 +52,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -73,7 +74,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -171,7 +172,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -193,7 +194,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -215,6 +216,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -223,7 +225,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -259,7 +261,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -288,7 +290,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -303,12 +304,12 @@
       <property role="TrG5h" value="LOG" />
       <property role="3TUv4t" value="true" />
       <node concept="3uibUv" id="3x_7aSI23Ce" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
+        <ref role="3uigEE" to="wwqx:~Logger" resolve="Logger" />
       </node>
       <node concept="3Tm6S6" id="3x_7aSI21Y2" role="1B3o_S" />
       <node concept="2YIFZM" id="3x_7aSI2404" role="33vP2m">
-        <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-        <ref role="37wK5l" to="q7tw:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
+        <ref role="1Pybhc" to="wwqx:~Logger" resolve="Logger" />
+        <ref role="37wK5l" to="wwqx:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
         <node concept="3VsKOn" id="3x_7aSI24$i" role="37wK5m">
           <ref role="3VsUkX" node="3_loG33_Tx" resolve="DependencyBuilder" />
         </node>
@@ -554,7 +555,7 @@
                     <ref role="3cqZAo" node="3x_7aSI24Mw" resolve="LOG" />
                   </node>
                   <node concept="liA8E" id="3x_7aSI27kz" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
                     <node concept="3cpWs3" id="3x_7aSI290B" role="37wK5m">
                       <node concept="2OqwBi" id="3x_7aSI2aun" role="3uHU7w">
                         <node concept="37vLTw" id="3x_7aSI2afG" role="2Oq$k0">
@@ -624,7 +625,7 @@
                     <ref role="3cqZAo" node="3x_7aSI24Mw" resolve="LOG" />
                   </node>
                   <node concept="liA8E" id="3x_7aSI2d1o" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
                     <node concept="3cpWs3" id="3x_7aSI2d1p" role="37wK5m">
                       <node concept="2OqwBi" id="3x_7aSI2d1q" role="3uHU7w">
                         <node concept="37vLTw" id="3x_7aSI2d1r" role="2Oq$k0">
@@ -700,7 +701,7 @@
                     <ref role="3cqZAo" node="3x_7aSI24Mw" resolve="LOG" />
                   </node>
                   <node concept="liA8E" id="3x_7aSI2FtS" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
                     <node concept="3cpWs3" id="3x_7aSI2FtT" role="37wK5m">
                       <node concept="2OqwBi" id="3x_7aSI2FtU" role="3uHU7w">
                         <node concept="37vLTw" id="3x_7aSI2GmZ" role="2Oq$k0">
@@ -768,7 +769,7 @@
                     <ref role="3cqZAo" node="3x_7aSI24Mw" resolve="LOG" />
                   </node>
                   <node concept="liA8E" id="3x_7aSI3Oey" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
                     <node concept="3cpWs3" id="3x_7aSI3Oez" role="37wK5m">
                       <node concept="2OqwBi" id="3x_7aSI3PUP" role="3uHU7w">
                         <node concept="37vLTw" id="3x_7aSI3PFX" role="2Oq$k0">
@@ -1082,15 +1083,15 @@
                       <node concept="3clFbF" id="3x_7aSIHdbd" role="3cqZAp">
                         <node concept="2OqwBi" id="3x_7aSIHdo3" role="3clFbG">
                           <node concept="37vLTw" id="3x_7aSIHdbc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3x_7aSIHcWl" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Dm" resolve="it" />
                           </node>
                           <node concept="2z74zc" id="3x_7aSIHdF1" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3x_7aSIHcWl" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Dm" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3x_7aSIHcWm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Dn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1101,7 +1102,7 @@
                     <node concept="3clFbF" id="3x_7aSIHGFA" role="3cqZAp">
                       <node concept="2OqwBi" id="3x_7aSIHfq$" role="3clFbG">
                         <node concept="37vLTw" id="3x_7aSIHHay" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3x_7aSIHGkh" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Do" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3x_7aSIHfCd" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SReference.getTargetNode()" resolve="getTargetNode" />
@@ -1109,9 +1110,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3x_7aSIHGkh" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Do" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3x_7aSIHGki" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Dp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2003,6 +2004,7 @@
     <property role="TrG5h" value="RebuildDependencies_Project" />
     <property role="2uzpH1" value="Rebuild with Dependencies" />
     <property role="3GE5qa" value="project" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3x_7aSMkOzD" role="tncku">
       <node concept="3clFbS" id="3x_7aSMkOzE" role="2VODD2">
         <node concept="3cpWs8" id="3x_7aSMkOzF" role="3cqZAp">
@@ -2077,6 +2079,7 @@
     <property role="TrG5h" value="RebuildDependencies_Module" />
     <property role="2uzpH1" value="Rebuild with Dependencies" />
     <property role="3GE5qa" value="module" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3x_7aSMkI7s" role="tncku">
       <node concept="3clFbS" id="3x_7aSMkI7t" role="2VODD2">
         <node concept="3cpWs8" id="3x_7aSMkI7u" role="3cqZAp">
@@ -2154,6 +2157,7 @@
     <property role="TrG5h" value="RebuildDependencies_Model" />
     <property role="2uzpH1" value="Rebuild with Dependencies" />
     <property role="3GE5qa" value="model" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3_loG3uwDj" role="tncku">
       <node concept="3clFbS" id="3_loG3uwDk" role="2VODD2">
         <node concept="3clFbF" id="3_loG3uwDu" role="3cqZAp">
@@ -2205,6 +2209,7 @@
     <property role="TrG5h" value="BuildDependencies_Module" />
     <property role="2uzpH1" value="Make with Dependencies" />
     <property role="3GE5qa" value="module" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3x_7aSMkC8f" role="tncku">
       <node concept="3clFbS" id="3x_7aSMkC8g" role="2VODD2">
         <node concept="3cpWs8" id="3x_7aSMkFnW" role="3cqZAp">
@@ -2282,6 +2287,7 @@
     <property role="TrG5h" value="BuildDependencies_Model" />
     <property role="2uzpH1" value="Make with Dependencies" />
     <property role="3GE5qa" value="model" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3_loG33b7g" role="tncku">
       <node concept="3clFbS" id="3_loG33b7h" role="2VODD2">
         <node concept="3clFbF" id="3x_7aSMkAvw" role="3cqZAp">
@@ -2333,6 +2339,7 @@
     <property role="TrG5h" value="BuildDependencies_Project" />
     <property role="2uzpH1" value="Build with Dependencies" />
     <property role="3GE5qa" value="project" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3x_7aSMkJ6o" role="tncku">
       <node concept="3clFbS" id="3x_7aSMkJ6p" role="2VODD2">
         <node concept="3cpWs8" id="3x_7aSMkJ6q" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage.msd
index 5f99ac7a090..3518972bbd2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage/com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage" uuid="841cfdd9-ec16-4978-b87d-93178df0473a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ccmenu.reftarget.baseLanguage" uuid="841cfdd9-ec16-4978-b87d-93178df0473a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">3ab9bd46-be60-4c45-806b-37a5b96358a2(com.mbeddr.mpsutil.ccmenu.reftarget.runtime)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:f92af8d7-1fae-4067-8109-17acf80f8e58:com.mbeddr.mpsutil.ccmenu.reftarget" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.msd
index 14c234bfca1..7dc2d1af244 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ccmenu.reftarget.runtime" uuid="3ab9bd46-be60-4c45-806b-37a5b96358a2" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ccmenu.reftarget.runtime" uuid="3ab9bd46-be60-4c45-806b-37a5b96358a2" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:935bff03-e393-4547-a3a2-60335e0cad25:com.mbeddr.mpsutil.ccmenu" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/models/com/mbeddr/mpsutil/ccmenu/reftarget/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/models/com/mbeddr/mpsutil/ccmenu/reftarget/runtime/plugin.mps
index 0be042d946c..fe40363f507 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/models/com/mbeddr/mpsutil/ccmenu/reftarget/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/models/com/mbeddr/mpsutil/ccmenu/reftarget/runtime/plugin.mps
@@ -28,6 +28,7 @@
     <import index="6lvu" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellMenu(MPS.Editor/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -49,7 +50,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -162,7 +163,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -191,7 +192,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -243,6 +244,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -319,7 +321,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -365,7 +367,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -627,7 +628,7 @@
                           <node concept="3clFbF" id="5s_Hn9onCDs" role="3cqZAp">
                             <node concept="2OqwBi" id="5s_Hn9onCDt" role="3clFbG">
                               <node concept="37vLTw" id="5s_Hn9onCDu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5s_Hn9onCDx" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Dq" resolve="it" />
                               </node>
                               <node concept="liA8E" id="5s_Hn9onCDv" role="2OqNvi">
                                 <ref role="37wK5l" to="f4zo:~SubstituteAction.getDescriptionText(java.lang.String)" resolve="getDescriptionText" />
@@ -638,9 +639,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5s_Hn9onCDx" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Dq" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5s_Hn9onCDy" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Dr" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="1nlBCl" id="5s_Hn9onCDz" role="2S7zOq">
@@ -1574,7 +1575,7 @@
                         <node concept="3clFbF" id="2CFqHq6qAIf" role="3cqZAp">
                           <node concept="2OqwBi" id="2CFqHq6qAIg" role="3clFbG">
                             <node concept="37vLTw" id="2CFqHq6qAIh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2CFqHq6qAIj" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ds" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2CFqHq6qAIi" role="2OqNvi">
                               <ref role="37wK5l" to="cmfw:~SNodeReadEvent.getNode()" resolve="getNode" />
@@ -1582,9 +1583,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2CFqHq6qAIj" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ds" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2CFqHq6qAIk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Dt" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1721,7 +1722,7 @@
                               <node concept="3clFbF" id="2CPtIILYAja" role="3cqZAp">
                                 <node concept="2OqwBi" id="2CPtIILYAmO" role="3clFbG">
                                   <node concept="37vLTw" id="2CPtIILYAj9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2CPtIILYAcr" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Du" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="2CPtIILYAtM" role="2OqNvi">
                                     <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
@@ -1737,9 +1738,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2CPtIILYAcr" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2Du" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2CPtIILYAcs" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2Dv" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1957,7 +1958,7 @@
                                 <node concept="3clFbF" id="2CPtIILYM0f" role="3cqZAp">
                                   <node concept="2OqwBi" id="2CPtIILYM4g" role="3clFbG">
                                     <node concept="37vLTw" id="2CPtIILYM0e" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2CPtIILYLT7" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Dw" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="2CPtIILYMb_" role="2OqNvi">
                                       <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
@@ -1973,9 +1974,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2CPtIILYLT7" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2Dw" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2CPtIILYLT8" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2Dx" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2501,15 +2502,15 @@
                       <node concept="1rXfSq" id="2CFqHq6C8Qd" role="3uHU7B">
                         <ref role="37wK5l" node="2CFqHq6BSYo" resolve="getCharacteristicReference" />
                         <node concept="37vLTw" id="2CFqHq6C8TU" role="37wK5m">
-                          <ref role="3cqZAo" node="2CFqHq6pTOo" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Dy" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2CFqHq6pTOo" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Dy" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2CFqHq6pTOp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Dz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2886,7 +2887,7 @@
                     <node concept="3clFbF" id="4UuUKLR0jUC" role="3cqZAp">
                       <node concept="2OqwBi" id="2CFqHq6D7z4" role="3clFbG">
                         <node concept="37vLTw" id="4UuUKLR0jYb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4UuUKLR0jMm" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2D$" resolve="it" />
                         </node>
                         <node concept="liA8E" id="2CFqHq6D7CF" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
@@ -2897,9 +2898,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4UuUKLR0jMm" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2D$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4UuUKLR0jMn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2D_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2910,8 +2911,8 @@
                   <node concept="3clFbF" id="4UuUKLR24LJ" role="3cqZAp">
                     <node concept="2OqwBi" id="6g_o1CJGE1u" role="3clFbG">
                       <node concept="2YIFZM" id="6g_o1CJG_60" role="2Oq$k0">
-                        <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
-                        <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                        <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+                        <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                         <node concept="2OqwBi" id="6g_o1CJGCzy" role="37wK5m">
                           <node concept="2OqwBi" id="6g_o1CJGBNl" role="2Oq$k0">
                             <node concept="2OqwBi" id="6g_o1CJGBa3" role="2Oq$k0">
@@ -2931,7 +2932,7 @@
                               <node concept="liA8E" id="6g_o1CJGBzA" role="2OqNvi">
                                 <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
                                 <node concept="37vLTw" id="6g_o1CJG_62" role="37wK5m">
-                                  <ref role="3cqZAo" node="4UuUKLR24II" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2DA" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -2953,9 +2954,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4UuUKLR24II" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2DA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4UuUKLR24IJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2DB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3002,7 +3003,7 @@
                           <node concept="2OqwBi" id="4UuUKLR2nRV" role="3uHU7B">
                             <node concept="2JrnkZ" id="4UuUKLR2nNU" role="2Oq$k0">
                               <node concept="37vLTw" id="4UuUKLR2nws" role="2JrQYb">
-                                <ref role="3cqZAo" node="4UuUKLR2n3F" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2DC" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="4UuUKLR2o66" role="2OqNvi">
@@ -3013,7 +3014,7 @@
                         <node concept="3clFbC" id="4UuUKLR2niE" role="3uHU7B">
                           <node concept="2OqwBi" id="4UuUKLR2n9G" role="3uHU7B">
                             <node concept="37vLTw" id="4UuUKLR2n6Q" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4UuUKLR2n3F" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2DC" resolve="it" />
                             </node>
                             <node concept="1mfA1w" id="4UuUKLR2ndx" role="2OqNvi" />
                           </node>
@@ -3024,9 +3025,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4UuUKLR2n3F" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2DC" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4UuUKLR2n3G" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2DD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3710,7 +3711,7 @@
                                     <node concept="22lmx$" id="1WjrBsNFjNJ" role="3clFbG">
                                       <node concept="2OqwBi" id="1WjrBsNFkdS" role="3uHU7B">
                                         <node concept="37vLTw" id="1WjrBsNFk1U" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1WjrBsNEZfl" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2DE" resolve="it" />
                                         </node>
                                         <node concept="1mIQ4w" id="1WjrBsNFkve" role="2OqNvi">
                                           <node concept="chp4Y" id="1WjrBsNFkGV" role="cj9EA">
@@ -3721,7 +3722,7 @@
                                       <node concept="2OqwBi" id="1WjrBsNFaDc" role="3uHU7w">
                                         <node concept="2OqwBi" id="1WjrBsNFaDd" role="2Oq$k0">
                                           <node concept="37vLTw" id="1WjrBsNFaDe" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1WjrBsNEZfl" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2DE" resolve="it" />
                                           </node>
                                           <node concept="2NL2c5" id="2Fugwv5ERUl" role="2OqNvi" />
                                         </node>
@@ -3732,9 +3733,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1WjrBsNEZfl" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2DE" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1WjrBsNEZfm" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2DF" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3754,7 +3755,7 @@
                                   <node concept="1PxgMI" id="1WjrBsNEQQz" role="2Oq$k0">
                                     <property role="1BlNFB" value="true" />
                                     <node concept="37vLTw" id="1WjrBsNExVp" role="1m5AlR">
-                                      <ref role="3cqZAo" node="4UuUKLR0P0q" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2DG" resolve="it" />
                                     </node>
                                     <node concept="chp4Y" id="5RIakkDJOzL" role="3oSUPX">
                                       <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
@@ -3778,7 +3779,7 @@
                                         <node concept="2OqwBi" id="1WjrBsNFtWI" role="3uHU7w">
                                           <node concept="2OqwBi" id="1WjrBsNFtfH" role="2Oq$k0">
                                             <node concept="37vLTw" id="1WjrBsNFt3e" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4UuUKLR0P0q" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2DG" resolve="it" />
                                             </node>
                                             <node concept="2Ttrtt" id="1WjrBsNFtwS" role="2OqNvi" />
                                           </node>
@@ -3788,7 +3789,7 @@
                                           <node concept="2OqwBi" id="1WjrBsNE$WX" role="3uHU7B">
                                             <node concept="2OqwBi" id="1WjrBsNE$Ba" role="2Oq$k0">
                                               <node concept="37vLTw" id="1WjrBsNE$u$" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4UuUKLR0P0q" resolve="it" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2DG" resolve="it" />
                                               </node>
                                               <node concept="2yIwOk" id="1WjrBsNE$LN" role="2OqNvi" />
                                             </node>
@@ -3819,9 +3820,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4UuUKLR0P0q" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2DG" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4UuUKLR0P0r" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2DH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3832,15 +3833,15 @@
                           <node concept="3clFbF" id="1WjrBsNEKDT" role="3cqZAp">
                             <node concept="2OqwBi" id="1WjrBsNEKO6" role="3clFbG">
                               <node concept="37vLTw" id="1WjrBsNEKDS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1WjrBsNEKoN" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2DI" resolve="it" />
                               </node>
                               <node concept="17RvpY" id="1WjrBsNEL91" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1WjrBsNEKoN" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2DI" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1WjrBsNEKoO" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2DJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/com.mbeddr.mpsutil.ccmenu.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/com.mbeddr.mpsutil.ccmenu.runtime.msd
index 467102e202a..b8f94a5d667 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/com.mbeddr.mpsutil.ccmenu.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/com.mbeddr.mpsutil.ccmenu.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ccmenu.runtime" uuid="bc20ac0c-ee07-4313-9d3e-cd7cd23e1920" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ccmenu.runtime" uuid="bc20ac0c-ee07-4313-9d3e-cd7cd23e1920" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -28,7 +27,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -36,7 +35,7 @@
     <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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/api.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/api.mps
index 0d0336a3ddf..7104ff8076f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/api.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/api.mps
@@ -17,14 +17,14 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/chooser.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/chooser.mps
index 4c3f46e7ae1..5391db4e063 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/chooser.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/chooser.mps
@@ -17,7 +17,6 @@
     <import index="pjrh" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter(MPS.Core/)" />
     <import index="xnls" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.icons(MPS.Platform/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="fyhk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps(MPS.Core/)" />
     <import index="6lvu" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellMenu(MPS.Editor/)" />
@@ -44,6 +43,7 @@
     <import index="cttk" ref="r:5ff047e0-2953-4750-806a-bdc16824aa89(jetbrains.mps.smodel)" />
     <import index="j0b4" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.keyboard(MPS.Editor/)" />
     <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
+    <import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -83,7 +83,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -225,7 +225,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -259,7 +259,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -316,6 +316,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -340,7 +341,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -398,7 +399,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
@@ -491,11 +491,11 @@
       <property role="TrG5h" value="LOG" />
       <property role="3TUv4t" value="true" />
       <node concept="3uibUv" id="2Z2H3pkZYxr" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
+        <ref role="3uigEE" to="wwqx:~Logger" resolve="Logger" />
       </node>
       <node concept="2YIFZM" id="2Z2H3pkZYI7" role="33vP2m">
-        <ref role="1Pybhc" to="q7tw:~LogManager" resolve="LogManager" />
-        <ref role="37wK5l" to="q7tw:~LogManager.getLogger(java.lang.Class)" resolve="getLogger" />
+        <ref role="1Pybhc" to="wwqx:~Logger" resolve="Logger" />
+        <ref role="37wK5l" to="wwqx:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
         <node concept="3VsKOn" id="2Z2H3pkZYxu" role="37wK5m">
           <ref role="3VsUkX" node="2Z2H3pkZYxi" resolve="GroupedItemCellRenderer" />
         </node>
@@ -1411,8 +1411,10 @@
                     <ref role="1PxDUh" node="2Z2H3pkZYxi" resolve="GroupedItemCellRenderer" />
                   </node>
                   <node concept="liA8E" id="2Z2H3pkZYSx" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="10Nm6u" id="2Z2H3pkZYAw" role="37wK5m" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
+                    <node concept="Xl_RD" id="2kdwe4vT_b0" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
                     <node concept="37vLTw" id="2Z2H3pkZYAx" role="37wK5m">
                       <ref role="3cqZAo" node="2Z2H3pkZYAp" resolve="t" />
                     </node>
@@ -1741,8 +1743,10 @@
                         <ref role="3cqZAo" node="2Z2H3pkZYxq" resolve="LOG" />
                       </node>
                       <node concept="liA8E" id="2Z2H3pkZYTk" role="2OqNvi">
-                        <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                        <node concept="10Nm6u" id="2Z2H3pkZYCd" role="37wK5m" />
+                        <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
+                        <node concept="Xl_RD" id="2kdwe4vTJP3" role="37wK5m">
+                          <property role="Xl_RC" value="" />
+                        </node>
                         <node concept="37vLTw" id="2Z2H3pkZYCe" role="37wK5m">
                           <ref role="3cqZAo" node="2Z2H3pkZYC6" resolve="t" />
                         </node>
@@ -1867,8 +1871,10 @@
                     <ref role="1PxDUh" node="2Z2H3pkZYxi" resolve="GroupedItemCellRenderer" />
                   </node>
                   <node concept="liA8E" id="2Z2H3pkZYTu" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="10Nm6u" id="2Z2H3pkZYCS" role="37wK5m" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
+                    <node concept="Xl_RD" id="2kdwe4vTV7G" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
                     <node concept="37vLTw" id="2Z2H3pkZYCT" role="37wK5m">
                       <ref role="3cqZAo" node="2Z2H3pkZYCL" resolve="t" />
                     </node>
@@ -1943,8 +1949,10 @@
                     <ref role="3cqZAo" node="2Z2H3pkZYxq" resolve="LOG" />
                   </node>
                   <node concept="liA8E" id="2Z2H3pkZYTP" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="10Nm6u" id="2Z2H3pkZYDr" role="37wK5m" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
+                    <node concept="Xl_RD" id="2kdwe4vU1IT" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
                     <node concept="37vLTw" id="2Z2H3pkZYDs" role="37wK5m">
                       <ref role="3cqZAo" node="2Z2H3pkZYDh" resolve="t" />
                     </node>
@@ -2009,8 +2017,10 @@
                     <ref role="3cqZAo" node="2Z2H3pkZYxq" resolve="LOG" />
                   </node>
                   <node concept="liA8E" id="2Z2H3pkZYUf" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="10Nm6u" id="2Z2H3pkZYDJ" role="37wK5m" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
+                    <node concept="Xl_RD" id="2kdwe4vUbgr" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
                     <node concept="37vLTw" id="2Z2H3pkZYDK" role="37wK5m">
                       <ref role="3cqZAo" node="2Z2H3pkZYD_" resolve="t" />
                     </node>
@@ -3650,7 +3660,7 @@
                         <node concept="3clFbF" id="1uZEtAirj2D" role="3cqZAp">
                           <node concept="2OqwBi" id="1uZEtAirj5y" role="3clFbG">
                             <node concept="37vLTw" id="1uZEtAirj2C" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1uZEtAirieO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2DK" resolve="it" />
                             </node>
                             <node concept="liA8E" id="1uZEtAirj9K" role="2OqNvi">
                               <ref role="37wK5l" to="exxq:1uZEtAiqnir" resolve="getStyles" />
@@ -3658,9 +3668,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1uZEtAirieO" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2DK" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1uZEtAirieP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2DL" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3773,8 +3783,10 @@
                     <ref role="1PxDUh" node="2Z2H3pkZYxi" resolve="GroupedItemCellRenderer" />
                   </node>
                   <node concept="liA8E" id="2Z2H3pkZYYU" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="10Nm6u" id="2Z2H3pkZYFK" role="37wK5m" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String,java.lang.Throwable)" resolve="error" />
+                    <node concept="Xl_RD" id="2kdwe4vUf90" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
                     <node concept="37vLTw" id="2Z2H3pkZYFL" role="37wK5m">
                       <ref role="3cqZAo" node="2Z2H3pkZYFD" resolve="t" />
                     </node>
@@ -4244,11 +4256,11 @@
       <property role="TrG5h" value="LOG" />
       <property role="3TUv4t" value="true" />
       <node concept="3uibUv" id="2Z2H3pkZiFF" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
+        <ref role="3uigEE" to="wwqx:~Logger" resolve="Logger" />
       </node>
       <node concept="2YIFZM" id="2Z2H3pkZkMC" role="33vP2m">
-        <ref role="1Pybhc" to="q7tw:~LogManager" resolve="LogManager" />
-        <ref role="37wK5l" to="q7tw:~LogManager.getLogger(java.lang.Class)" resolve="getLogger" />
+        <ref role="1Pybhc" to="wwqx:~Logger" resolve="Logger" />
+        <ref role="37wK5l" to="wwqx:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
         <node concept="3VsKOn" id="2Z2H3pkZiFI" role="37wK5m">
           <ref role="3VsUkX" node="2Z2H3pkZixy" resolve="GroupedSubstituteChooser" />
         </node>
@@ -6651,6 +6663,7 @@
               </node>
             </node>
             <node concept="3clFbS" id="2Z2H3pkZiTc" role="1zc67A">
+              <node concept="3clFbH" id="5EH2I6rl4k$" role="3cqZAp" />
               <node concept="3clFbF" id="2Z2H3pkZiTd" role="3cqZAp">
                 <node concept="2OqwBi" id="2Z2H3pkZl0s" role="3clFbG">
                   <node concept="10M0yZ" id="2Z2H3pl0CyT" role="2Oq$k0">
@@ -6658,7 +6671,7 @@
                     <ref role="3cqZAo" node="2Z2H3pkZiFE" resolve="LOG" />
                   </node>
                   <node concept="liA8E" id="2Z2H3pkZl0t" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
+                    <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.Throwable,java.lang.Object)" resolve="error" />
                     <node concept="37vLTw" id="2Z2H3pkZiTf" role="37wK5m">
                       <ref role="3cqZAo" node="2Z2H3pkZiT8" resolve="e" />
                     </node>
@@ -7047,7 +7060,7 @@
                       <node concept="3clFbF" id="1uZEtAim0E3" role="3cqZAp">
                         <node concept="2OqwBi" id="1uZEtAim0LD" role="3clFbG">
                           <node concept="37vLTw" id="1uZEtAim0E2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1uZEtAim0gQ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2DM" resolve="it" />
                           </node>
                           <node concept="liA8E" id="1uZEtAim0Vb" role="2OqNvi">
                             <ref role="37wK5l" to="exxq:1uZEtAijCZm" resolve="getSorters" />
@@ -7055,9 +7068,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1uZEtAim0gQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2DM" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1uZEtAim0gR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2DN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7089,7 +7102,7 @@
                             <node concept="3clFbF" id="1uZEtAim6us" role="3cqZAp">
                               <node concept="2OqwBi" id="1uZEtAim6x_" role="3clFbG">
                                 <node concept="37vLTw" id="1uZEtAim6ur" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1uZEtAim69p" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2DO" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="1uZEtAim6Bk" role="2OqNvi">
                                   <ref role="37wK5l" to="exxq:1uZEtAikauW" resolve="isApplicable" />
@@ -7105,9 +7118,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1uZEtAim69p" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2DO" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1uZEtAim69q" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2DP" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -9137,14 +9150,14 @@
                       <node concept="1rXfSq" id="4rTrx84QNTR" role="3clFbG">
                         <ref role="37wK5l" node="4rTrx84QCMz" resolve="removeTab" />
                         <node concept="37vLTw" id="4rTrx84QOzl" role="37wK5m">
-                          <ref role="3cqZAo" node="4rTrx84QLML" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2DQ" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4rTrx84QLML" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2DQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4rTrx84QLMM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2DR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -12416,7 +12429,7 @@
                       </node>
                       <node concept="2OqwBi" id="4rTrx84Jgh8" role="3uHU7B">
                         <node concept="37vLTw" id="4rTrx84Jgdl" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4rTrx84JfZO" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2DS" resolve="it" />
                         </node>
                         <node concept="liA8E" id="4rTrx84Jgmy" role="2OqNvi">
                           <ref role="37wK5l" node="4rTrx84Iqvx" resolve="getLabel" />
@@ -12425,9 +12438,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4rTrx84JfZO" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2DS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4rTrx84JfZP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2DT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12861,15 +12874,15 @@
                               <ref role="3cqZAo" node="1uZEtAileQ1" resolve="myMenuModel" />
                             </node>
                             <node concept="37vLTw" id="1uZEtAinut1" role="37wK5m">
-                              <ref role="3cqZAo" node="1uZEtAinsjE" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2DU" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1uZEtAinsjE" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2DU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1uZEtAinsjF" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2DV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -12915,15 +12928,15 @@
                                 <ref role="3cqZAo" node="1uZEtAileQ1" resolve="myMenuModel" />
                               </node>
                               <node concept="37vLTw" id="1uZEtAinuNn" role="37wK5m">
-                                <ref role="3cqZAo" node="1uZEtAinuNo" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2DW" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1uZEtAinuNo" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2DW" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1uZEtAinuNp" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2DX" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -13068,7 +13081,7 @@
                     <node concept="3clFbF" id="1uZEtAinJCB" role="3cqZAp">
                       <node concept="2OqwBi" id="1uZEtAinJH4" role="3clFbG">
                         <node concept="37vLTw" id="1uZEtAinJCA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1uZEtAinJpP" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2DY" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1uZEtAinJMm" role="2OqNvi">
                           <ref role="37wK5l" node="1uZEtAil5uL" resolve="getSubstituteAction" />
@@ -13076,9 +13089,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1uZEtAinJpP" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2DY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1uZEtAinJpQ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2DZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -13279,7 +13292,7 @@
                                 <ref role="3uigEE" to="65ig:rf2b76NtIk" resolve="IMenuEntry" />
                               </node>
                               <node concept="37vLTw" id="1uZEtAin$QX" role="33vP2m">
-                                <ref role="3cqZAo" node="1uZEtAilcvL" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2E0" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -13289,9 +13302,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1uZEtAilcvL" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2E0" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1uZEtAilcvM" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2E1" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -14539,7 +14552,7 @@
                   <node concept="3clFbF" id="1uZEtAirdYb" role="3cqZAp">
                     <node concept="2OqwBi" id="1uZEtAire2b" role="3clFbG">
                       <node concept="37vLTw" id="1uZEtAirdYa" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1uZEtAirdD_" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2E2" resolve="it" />
                       </node>
                       <node concept="liA8E" id="1uZEtAire6F" role="2OqNvi">
                         <ref role="37wK5l" node="1uZEtAir4ZK" resolve="isApplicable" />
@@ -14550,9 +14563,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1uZEtAirdD_" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2E2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1uZEtAirdDA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2E3" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/descriptor.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/descriptor.mps
index 8abb0c0828f..fbb07c53f80 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/descriptor.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/descriptor.mps
@@ -25,7 +25,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -75,7 +75,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -105,7 +105,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/plugin.mps
index b5f62e4bf36..42460a5f91b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.runtime/models/com/mbeddr/mpsutil/ccmenu/runtime/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:96a5ae0c-9491-4650-90e1-34141035590c(com.mbeddr.mpsutil.ccmenu.runtime.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -103,7 +103,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -135,7 +135,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -143,7 +143,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/com.mbeddr.mpsutil.ccmenu.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/com.mbeddr.mpsutil.ccmenu.sandbox.msd
index 395a373776d..7f5e1bc2081 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/com.mbeddr.mpsutil.ccmenu.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/com.mbeddr.mpsutil.ccmenu.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ccmenu.sandbox" uuid="801eb1c3-74c7-4f8c-b33f-cfdbd79fcfc2" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ccmenu.sandbox" uuid="801eb1c3-74c7-4f8c-b33f-cfdbd79fcfc2" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:7369078b-42c2-46a1-a2d6-4e4224650944:com.mbeddr.mpsutil.ccmenu.sandboxlang" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/models/com/mbeddr/mpsutil/ccmenu/sandbox.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/models/com/mbeddr/mpsutil/ccmenu/sandbox.mps
index ab1497d2150..6fcfd662874 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/models/com/mbeddr/mpsutil/ccmenu/sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/models/com/mbeddr/mpsutil/ccmenu/sandbox.mps
@@ -39,7 +39,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -52,7 +52,7 @@
       <concept id="7020116223055691882" name="com.mbeddr.mpsutil.ccmenu.sandboxlang.structure.ChildA" flags="ng" index="3snnrC" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.msd
index 970feedd0ab..5679a36960f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.common" uuid="c7a315e6-1d93-4186-85bc-2dfafd1ccc21" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.common" uuid="c7a315e6-1d93-4186-85bc-2dfafd1ccc21" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
index 913279adc38..24b7ef92bf0 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
@@ -41,7 +41,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -175,7 +175,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -202,7 +202,7 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1214918975462" name="jetbrains.mps.baseLanguage.structure.PostfixDecrementExpression" flags="nn" index="3uO5VW" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -271,7 +271,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graphTest@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graphTest@tests.mps
index c051e36ffb5..0ee0fa5c1be 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graphTest@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graphTest@tests.mps
@@ -5,7 +5,7 @@
     <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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
     <import index="gtp9" ref="r:007d0985-20e2-4d70-80f1-d0de1aff1076(com.mbeddr.mpsutil.common.graph)" />
@@ -36,7 +36,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -125,7 +125,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -148,7 +148,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -166,7 +166,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -185,7 +185,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/model.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/model.mps
index 12c14b0cd34..59b712531da 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/model.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/model.mps
@@ -143,6 +143,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -215,7 +216,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -559,7 +559,7 @@
                             <node concept="2JrnkZ" id="556AefeEq6x" role="2Oq$k0">
                               <node concept="2OqwBi" id="5GUwywcuF0r" role="2JrQYb">
                                 <node concept="37vLTw" id="5GUwywcuF0s" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5GUwywcuF0R" resolve="instance" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2E8" resolve="instance" />
                                 </node>
                                 <node concept="I4A8Y" id="5GUwywcuF0t" role="2OqNvi" />
                               </node>
@@ -604,9 +604,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5GUwywcuF0R" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2E8" role="1bW2Oz">
                       <property role="TrG5h" value="instance" />
-                      <node concept="2jxLKc" id="5GUwywcuF0S" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2E9" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
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 a3d43094267..7557fae7e41 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
@@ -242,6 +242,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -369,7 +370,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1328,7 +1328,7 @@
                         <node concept="3clFbF" id="6d0zIQxaPxG" role="3cqZAp">
                           <node concept="2OqwBi" id="6d0zIQxaPOD" role="3clFbG">
                             <node concept="37vLTw" id="6d0zIQxaPxF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6d0zIQxaPkC" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ea" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6d0zIQxaQ8v" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SProperty.getName()" resolve="getName" />
@@ -1336,9 +1336,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6d0zIQxaPkC" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ea" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6d0zIQxaPkD" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Eb" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1356,7 +1356,7 @@
                         <node concept="3clFbF" id="6d0zIQxaStp" role="3cqZAp">
                           <node concept="2OqwBi" id="6d0zIQxaSLf" role="3clFbG">
                             <node concept="37vLTw" id="6d0zIQxaSto" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6d0zIQxaSbP" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ec" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6d0zIQxaT9C" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SProperty.getName()" resolve="getName" />
@@ -1364,9 +1364,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6d0zIQxaSbP" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ec" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6d0zIQxaSbQ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Ed" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1595,15 +1595,15 @@
                         <node concept="3clFbF" id="3JMPeKaHTk9" role="3cqZAp">
                           <node concept="2OqwBi" id="3JMPeKaHTka" role="3clFbG">
                             <node concept="37vLTw" id="3JMPeKaHTkb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3JMPeKaHTkd" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ee" resolve="it" />
                             </node>
                             <node concept="CsP83" id="2Fugwv5K5WN" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3JMPeKaHTkd" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ee" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3JMPeKaHTke" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Ef" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1624,15 +1624,15 @@
                         <node concept="3clFbF" id="3JMPeKaHTko" role="3cqZAp">
                           <node concept="2OqwBi" id="3JMPeKaHTkp" role="3clFbG">
                             <node concept="37vLTw" id="3JMPeKaHTkq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3JMPeKaHTks" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Eg" resolve="it" />
                             </node>
                             <node concept="CsP83" id="2Fugwv5K6Ub" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3JMPeKaHTks" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Eg" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3JMPeKaHTkt" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Eh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2077,7 +2077,7 @@
                                 <node concept="2EnYce" id="3JMPeKaHTny" role="3uHU7B">
                                   <node concept="2OqwBi" id="5RIakkDJOOE" role="2Oq$k0">
                                     <node concept="37vLTw" id="5RIakkDJOOF" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3JMPeKaHTnD" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Ei" resolve="it" />
                                     </node>
                                     <node concept="2NL2c5" id="5RIakkDJOOG" role="2OqNvi" />
                                   </node>
@@ -2091,7 +2091,7 @@
                               </node>
                               <node concept="2OqwBi" id="3JMPeKaHTnA" role="3uHU7w">
                                 <node concept="37vLTw" id="3JMPeKaHTnB" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3JMPeKaHTnD" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Ei" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="3JMPeKaHTnC" role="2OqNvi" />
                               </node>
@@ -2099,9 +2099,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3JMPeKaHTnD" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ei" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3JMPeKaHTnE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Ej" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2129,7 +2129,7 @@
                                 <node concept="2EnYce" id="3JMPeKaHTnT" role="3uHU7B">
                                   <node concept="2OqwBi" id="5RIakkDJOOJ" role="2Oq$k0">
                                     <node concept="37vLTw" id="5RIakkDJOOK" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3JMPeKaHTo0" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Ek" resolve="it" />
                                     </node>
                                     <node concept="2NL2c5" id="5RIakkDJOOL" role="2OqNvi" />
                                   </node>
@@ -2143,7 +2143,7 @@
                               </node>
                               <node concept="2OqwBi" id="3JMPeKaHTnX" role="3uHU7w">
                                 <node concept="37vLTw" id="3JMPeKaHTnY" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3JMPeKaHTo0" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Ek" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="3JMPeKaHTnZ" role="2OqNvi" />
                               </node>
@@ -2151,9 +2151,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3JMPeKaHTo0" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ek" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3JMPeKaHTo1" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2El" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2269,7 +2269,7 @@
                           </node>
                           <node concept="2OqwBi" id="3JMPeKaHToQ" role="3uHU7B">
                             <node concept="37vLTw" id="3JMPeKaHToR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3JMPeKaHToY" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Em" resolve="it" />
                             </node>
                             <node concept="2bSWHS" id="3JMPeKaHToS" role="2OqNvi" />
                           </node>
@@ -2278,7 +2278,7 @@
                           <node concept="2EnYce" id="3JMPeKaHToU" role="3uHU7B">
                             <node concept="2OqwBi" id="5RIakkDJOOO" role="2Oq$k0">
                               <node concept="37vLTw" id="5RIakkDJOOP" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3JMPeKaHToY" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Em" resolve="it" />
                               </node>
                               <node concept="2NL2c5" id="5RIakkDJOOQ" role="2OqNvi" />
                             </node>
@@ -2293,9 +2293,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3JMPeKaHToY" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Em" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3JMPeKaHToZ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2En" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2318,7 +2318,7 @@
                           </node>
                           <node concept="2OqwBi" id="3JMPeKaHTpb" role="3uHU7B">
                             <node concept="37vLTw" id="3JMPeKaHTpc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3JMPeKaHTpj" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Eo" resolve="it" />
                             </node>
                             <node concept="2bSWHS" id="3JMPeKaHTpd" role="2OqNvi" />
                           </node>
@@ -2327,7 +2327,7 @@
                           <node concept="2EnYce" id="3JMPeKaHTpf" role="3uHU7B">
                             <node concept="2OqwBi" id="5RIakkDJOOT" role="2Oq$k0">
                               <node concept="37vLTw" id="5RIakkDJOOU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3JMPeKaHTpj" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Eo" resolve="it" />
                               </node>
                               <node concept="2NL2c5" id="5RIakkDJOOV" role="2OqNvi" />
                             </node>
@@ -2342,9 +2342,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3JMPeKaHTpj" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Eo" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3JMPeKaHTpk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Ep" role="1tU5fm" />
                   </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 9ff270b49ae..7ff762316d4 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.comparator.diff.demo.genplan" uuid="a83addf6-6ea9-4504-83d6-0211dab89b0f" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.comparator.diff.demo.genplan" uuid="a83addf6-6ea9-4504-83d6-0211dab89b0f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,11 +10,10 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:e0989c7a-8149-4be7-97b6-0b78561af099:com.mbeddr.demo.comparator.diff" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
   </languageVersions>
   <dependencyVersions>
     <module reference="a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.mpsutil.comparator.diff.demo.genplan)" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps
index a7955960705..cdd946a3def 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="e0989c7a-8149-4be7-97b6-0b78561af099" name="com.mbeddr.demo.comparator.diff" version="0" />
-    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
   <imports />
   <registry>
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 c7988183fab..e4d13007a9e 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.comparator.diff.demo.tests" uuid="5fc729b8-2fff-48a5-9bd3-4c1aaad33d23" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.comparator.diff.demo.tests" uuid="5fc729b8-2fff-48a5-9bd3-4c1aaad33d23" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -30,7 +29,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <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" />
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 679ae0e1f59..39d97ec18e9 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
@@ -9,7 +9,7 @@
     <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="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps
index 8ad132d6895..cb10fbda047 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps
@@ -13,7 +13,7 @@
       <concept id="3522954298058777217" name="com.mbeddr.demo.comparator.diff.structure.Entry" flags="ng" index="3RnEV5" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd
index 5dafe9a0423..dc8f0748a65 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.comparator" uuid="c6420b75-4569-420d-aaf7-9bc590ad7b2a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.comparator" uuid="c6420b75-4569-420d-aaf7-9bc590ad7b2a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f47b95d4-5e73-4c04-9204-18076950153b(com.mbeddr.mpsutil.compare)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:132aa4d8-a3f7-441c-a7eb-3fce23492c6a:jetbrains.mps.baseLanguage.builders" version="0" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model
index 787ff1984fd..4eb21bf66dc 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="content" value="header" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
@@ -34,8 +34,6 @@
     <import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" />
     <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="cttk" ref="r:5ff047e0-2953-4750-806a-bdc16824aa89(jetbrains.mps.smodel)" />
-    <import index="qjvf" ref="r:82cadfba-0fcc-402e-8eaa-37395d383fb6(com.mbeddr.mpsutil.compare.behavior)" implicit="true" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
   </imports>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr
index 9541c18a162..29773b4a295 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr
@@ -37,7 +37,7 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -78,7 +78,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,7 +97,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -127,7 +127,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr
index fb611536008..5c3e32ba48b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr
@@ -75,7 +75,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -136,7 +136,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -158,7 +158,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -183,6 +183,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -198,7 +199,7 @@
       <concept id="7288041816793071802" name="jetbrains.mps.baseLanguage.builders.structure.SimpleBuilder" flags="ng" index="1b09fh">
         <reference id="7288041816793071803" name="declaration" index="1b09fg" />
       </concept>
-      <concept id="7802271442981792228" name="jetbrains.mps.baseLanguage.builders.structure.BuilderContainer" flags="ng" index="1$nplI">
+      <concept id="7802271442981792228" name="jetbrains.mps.baseLanguage.builders.structure.BuilderContainer" flags="ngI" index="1$nplI">
         <child id="4797501453849924252" name="body" index="GGjiV" />
         <child id="4797501453850567416" name="builder" index="GIGjv" />
       </concept>
@@ -257,7 +258,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -301,7 +302,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1568,29 +1568,32 @@
                         <node concept="1bVj0M" id="2lpUxXMVVbg" role="23t8la">
                           <node concept="3clFbS" id="2lpUxXMVVbh" role="1bW5cS">
                             <node concept="3clFbF" id="2lpUxXMVVbi" role="3cqZAp">
-                              <node concept="17R0WA" id="E9Bg75ilbD" role="3clFbG">
-                                <node concept="2OqwBi" id="2lpUxXMVVbk" role="3uHU7B">
+                              <node concept="2OqwBi" id="2lpUxXMVVbj" role="3clFbG">
+                                <node concept="2OqwBi" id="2lpUxXMVVbk" role="2Oq$k0">
                                   <node concept="37vLTw" id="2lpUxXMVVbl" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2lpUxXMVVbp" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Eu" resolve="it" />
                                   </node>
                                   <node concept="2S8uIT" id="2lpUxXMVVbm" role="2OqNvi">
                                     <ref role="2S8YL0" node="DYlgnBsvwB" resolve="property" />
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="4_9e_ML9shG" role="3uHU7w">
-                                  <node concept="2GrUjf" id="2lpUxXMVVbo" role="2Oq$k0">
-                                    <ref role="2Gs0qQ" node="DYlgnAA7xB" resolve="p" />
-                                  </node>
-                                  <node concept="liA8E" id="4_9e_ML9xdr" role="2OqNvi">
-                                    <ref role="37wK5l" to="c17a:~SProperty.getName()" resolve="getName" />
+                                <node concept="liA8E" id="2lpUxXMVVbn" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                  <node concept="2OqwBi" id="4_9e_ML9shG" role="37wK5m">
+                                    <node concept="2GrUjf" id="2lpUxXMVVbo" role="2Oq$k0">
+                                      <ref role="2Gs0qQ" node="DYlgnAA7xB" resolve="p" />
+                                    </node>
+                                    <node concept="liA8E" id="4_9e_ML9xdr" role="2OqNvi">
+                                      <ref role="37wK5l" to="c17a:~SProperty.getName()" resolve="getName" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2lpUxXMVVbp" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2Eu" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2lpUxXMVVbq" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2Ev" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1652,14 +1655,14 @@
           <ref role="3uigEE" node="494SuRWLRaN" resolve="MPSNodeComparisonResult" />
         </node>
       </node>
+      <node concept="3cqZAl" id="DYlgnAA7x9" role="3clF45" />
+      <node concept="3Tm6S6" id="DYlgnAA7xa" role="1B3o_S" />
       <node concept="37vLTG" id="E9Bg74I4Wp" role="3clF46">
         <property role="TrG5h" value="options" />
         <node concept="3uibUv" id="E9Bg74Ieo8" role="1tU5fm">
           <ref role="3uigEE" node="E9Bg74y9pX" resolve="MPSComparatorOptions" />
         </node>
       </node>
-      <node concept="3cqZAl" id="DYlgnAA7x9" role="3clF45" />
-      <node concept="3Tm6S6" id="DYlgnAA7xa" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="DYlgnBuw$i" role="jymVt" />
     <node concept="2YIFZL" id="6fymoI4VsfK" role="jymVt">
@@ -1680,16 +1683,19 @@
                   <node concept="3clFbS" id="780iRhLF7qG" role="1bW5cS">
                     <node concept="3clFbF" id="780iRhLF7Hc" role="3cqZAp">
                       <node concept="1Wc70l" id="780iRhLF7He" role="3clFbG">
-                        <node concept="17R0WA" id="E9Bg75jzVO" role="3uHU7w">
-                          <node concept="37vLTw" id="780iRhLF7Hg" role="3uHU7B">
+                        <node concept="2OqwBi" id="780iRhLF7Hf" role="3uHU7w">
+                          <node concept="37vLTw" id="780iRhLF7Hg" role="2Oq$k0">
                             <ref role="3cqZAo" node="780iRhLDEbC" resolve="property" />
                           </node>
-                          <node concept="2OqwBi" id="780iRhLF7Hi" role="3uHU7w">
-                            <node concept="37vLTw" id="780iRhLFcBl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="780iRhLF7qH" resolve="it" />
-                            </node>
-                            <node concept="2S8uIT" id="780iRhLF7Hk" role="2OqNvi">
-                              <ref role="2S8YL0" node="DYlgnBsvwB" resolve="property" />
+                          <node concept="liA8E" id="780iRhLF7Hh" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                            <node concept="2OqwBi" id="780iRhLF7Hi" role="37wK5m">
+                              <node concept="37vLTw" id="780iRhLFcBl" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2SR9xrsN2Ew" resolve="it" />
+                              </node>
+                              <node concept="2S8uIT" id="780iRhLF7Hk" role="2OqNvi">
+                                <ref role="2S8YL0" node="DYlgnBsvwB" resolve="property" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -1703,7 +1709,7 @@
                                 <node concept="25Kdxt" id="780iRhLF7Hq" role="cj9EA">
                                   <node concept="2OqwBi" id="780iRhLF7Hr" role="25KhWn">
                                     <node concept="37vLTw" id="780iRhLF7U6" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="780iRhLF7qH" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Ew" resolve="it" />
                                     </node>
                                     <node concept="2S8uIT" id="780iRhLF7Ht" role="2OqNvi">
                                       <ref role="2S8YL0" node="DYlgnBsvz3" resolve="concept" />
@@ -1720,7 +1726,7 @@
                                 <node concept="25Kdxt" id="780iRhLF7Hx" role="cj9EA">
                                   <node concept="2OqwBi" id="780iRhLF7Hy" role="25KhWn">
                                     <node concept="37vLTw" id="780iRhLFasU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="780iRhLF7qH" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Ew" resolve="it" />
                                     </node>
                                     <node concept="2S8uIT" id="780iRhLF7H$" role="2OqNvi">
                                       <ref role="2S8YL0" node="DYlgnBsvz3" resolve="concept" />
@@ -1734,9 +1740,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="780iRhLF7qH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Ew" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="780iRhLF7qI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Ex" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1787,7 +1793,7 @@
                             <node concept="2OqwBi" id="4YRIhSKF2mQ" role="3clFbG">
                               <node concept="2OqwBi" id="4YRIhSKEOEu" role="2Oq$k0">
                                 <node concept="37vLTw" id="4YRIhSKELmt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4YRIhSKEDlo" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Ey" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="4YRIhSKEYM0" role="2OqNvi">
                                   <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -1801,9 +1807,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4YRIhSKEDlo" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Ey" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4YRIhSKEDlp" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Ez" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1812,15 +1818,12 @@
                     <node concept="1bVj0M" id="5uUCR4LO8LM" role="23t8la">
                       <node concept="3clFbS" id="5uUCR4LO8LN" role="1bW5cS">
                         <node concept="3clFbF" id="5uUCR4LPnrA" role="3cqZAp">
-                          <node concept="17R0WA" id="E9Bg75iKUn" role="3clFbG">
-                            <node concept="37vLTw" id="E9Bg75iR2G" role="3uHU7w">
-                              <ref role="3cqZAo" node="780iRhLDEbC" resolve="property" />
-                            </node>
-                            <node concept="2OqwBi" id="5uUCR4LPoy5" role="3uHU7B">
+                          <node concept="2OqwBi" id="5uUCR4LPx_v" role="3clFbG">
+                            <node concept="2OqwBi" id="5uUCR4LPoy5" role="2Oq$k0">
                               <node concept="1PxgMI" id="4YRIhSKFHXL" role="2Oq$k0">
                                 <node concept="2OqwBi" id="4YRIhSKFs20" role="1m5AlR">
                                   <node concept="37vLTw" id="5uUCR4LPnr_" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LO8LO" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2E$" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4YRIhSKF_0J" role="2OqNvi">
                                     <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -1834,12 +1837,18 @@
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                               </node>
                             </node>
+                            <node concept="liA8E" id="5uUCR4LPAw3" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                              <node concept="37vLTw" id="5uUCR4LPCMJ" role="37wK5m">
+                                <ref role="3cqZAo" node="780iRhLDEbC" resolve="property" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5uUCR4LO8LO" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2E$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5uUCR4LO8LP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2E_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1930,7 +1939,7 @@
                               <node concept="2OqwBi" id="4YRIhSKGjie" role="3clFbG">
                                 <node concept="2OqwBi" id="4YRIhSKGjif" role="2Oq$k0">
                                   <node concept="37vLTw" id="4YRIhSKGjig" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4YRIhSKGjik" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EA" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4YRIhSKGjih" role="2OqNvi">
                                     <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -1944,9 +1953,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4YRIhSKGjik" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2EA" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4YRIhSKGjil" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2EB" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1955,15 +1964,12 @@
                       <node concept="1bVj0M" id="5uUCR4LOtTj" role="23t8la">
                         <node concept="3clFbS" id="5uUCR4LOtTk" role="1bW5cS">
                           <node concept="3clFbF" id="5uUCR4LORNf" role="3cqZAp">
-                            <node concept="17R0WA" id="E9Bg75j7gC" role="3clFbG">
-                              <node concept="37vLTw" id="E9Bg75jexi" role="3uHU7w">
-                                <ref role="3cqZAo" node="780iRhLDEbC" resolve="property" />
-                              </node>
-                              <node concept="2OqwBi" id="5uUCR4LOTa_" role="3uHU7B">
+                            <node concept="2OqwBi" id="5uUCR4LP0vi" role="3clFbG">
+                              <node concept="2OqwBi" id="5uUCR4LOTa_" role="2Oq$k0">
                                 <node concept="1PxgMI" id="4YRIhSKGL0b" role="2Oq$k0">
                                   <node concept="2OqwBi" id="4YRIhSKGsgq" role="1m5AlR">
                                     <node concept="37vLTw" id="5uUCR4LORNe" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5uUCR4LOtTt" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2EC" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4YRIhSKGB1y" role="2OqNvi">
                                       <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -1977,12 +1983,18 @@
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                 </node>
                               </node>
+                              <node concept="liA8E" id="5uUCR4LP4X0" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                <node concept="37vLTw" id="5uUCR4LP7zB" role="37wK5m">
+                                  <ref role="3cqZAo" node="780iRhLDEbC" resolve="property" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LOtTt" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2EC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LOtTu" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2ED" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2010,7 +2022,7 @@
                               <node concept="2OqwBi" id="5uUCR4LUu14" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LUu15" role="2Oq$k0">
                                   <node concept="37vLTw" id="5uUCR4LUu16" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUu1g" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EE" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUu17" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUu18" role="3CFYIz">
@@ -2025,7 +2037,7 @@
                               <node concept="3y3z36" id="5uUCR4LUu1a" role="3uHU7B">
                                 <node concept="2OqwBi" id="5uUCR4LUu1b" role="3uHU7B">
                                   <node concept="37vLTw" id="5uUCR4LUu1c" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUu1g" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EE" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUu1d" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUu1e" role="3CFYIz">
@@ -2038,9 +2050,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LUu1g" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2EE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LUu1h" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2EF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2060,7 +2072,7 @@
                               <node concept="2OqwBi" id="5uUCR4LUu1r" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LUu1s" role="2Oq$k0">
                                   <node concept="37vLTw" id="5uUCR4LUu1t" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUu1B" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EG" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUu1u" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUu1v" role="3CFYIz">
@@ -2075,7 +2087,7 @@
                               <node concept="3y3z36" id="5uUCR4LUu1x" role="3uHU7B">
                                 <node concept="2OqwBi" id="5uUCR4LUu1y" role="3uHU7B">
                                   <node concept="37vLTw" id="5uUCR4LUu1z" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUu1B" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EG" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUu1$" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUu1_" role="3CFYIz">
@@ -2088,9 +2100,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LUu1B" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2EG" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LUu1C" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2EH" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2157,16 +2169,19 @@
                   <node concept="3clFbS" id="3qPjHtYt08O" role="1bW5cS">
                     <node concept="3clFbF" id="3qPjHtYt08P" role="3cqZAp">
                       <node concept="1Wc70l" id="3qPjHtYt08Q" role="3clFbG">
-                        <node concept="17R0WA" id="E9Bg75jXhY" role="3uHU7w">
-                          <node concept="37vLTw" id="3qPjHtYt08S" role="3uHU7B">
+                        <node concept="2OqwBi" id="3qPjHtYt08R" role="3uHU7w">
+                          <node concept="37vLTw" id="3qPjHtYt08S" role="2Oq$k0">
                             <ref role="3cqZAo" node="3qPjHtYt0bV" resolve="role" />
                           </node>
-                          <node concept="2OqwBi" id="3qPjHtYt08U" role="3uHU7w">
-                            <node concept="37vLTw" id="3qPjHtYtzrm" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3qPjHtYt09d" resolve="it" />
-                            </node>
-                            <node concept="2S8uIT" id="3qPjHtYt_uw" role="2OqNvi">
-                              <ref role="2S8YL0" node="3qPjHtYqUfo" resolve="reference" />
+                          <node concept="liA8E" id="3qPjHtYt08T" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                            <node concept="2OqwBi" id="3qPjHtYt08U" role="37wK5m">
+                              <node concept="37vLTw" id="3qPjHtYtzrm" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2SR9xrsN2EI" resolve="it" />
+                              </node>
+                              <node concept="2S8uIT" id="3qPjHtYt_uw" role="2OqNvi">
+                                <ref role="2S8YL0" node="3qPjHtYqUfo" resolve="reference" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -2180,7 +2195,7 @@
                                 <node concept="25Kdxt" id="3qPjHtYt092" role="cj9EA">
                                   <node concept="2OqwBi" id="3qPjHtYt093" role="25KhWn">
                                     <node concept="37vLTw" id="3qPjHtYtq0g" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3qPjHtYt09d" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2EI" resolve="it" />
                                     </node>
                                     <node concept="2S8uIT" id="3qPjHtYtsUE" role="2OqNvi">
                                       <ref role="2S8YL0" node="3qPjHtYqUfh" resolve="concept" />
@@ -2197,7 +2212,7 @@
                                 <node concept="25Kdxt" id="3qPjHtYt099" role="cj9EA">
                                   <node concept="2OqwBi" id="3qPjHtYt09a" role="25KhWn">
                                     <node concept="37vLTw" id="3qPjHtYtupZ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3qPjHtYt09d" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2EI" resolve="it" />
                                     </node>
                                     <node concept="2S8uIT" id="3qPjHtYtwGK" role="2OqNvi">
                                       <ref role="2S8YL0" node="3qPjHtYqUfh" resolve="concept" />
@@ -2211,9 +2226,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3qPjHtYt09d" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2EI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3qPjHtYt09e" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2EJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2315,14 +2330,14 @@
                   <node concept="3clFbF" id="DYlgnAA7yR" role="3cqZAp">
                     <node concept="37vLTI" id="DYlgnAA7yS" role="3clFbG">
                       <node concept="37vLTw" id="DYlgnAA7yT" role="37vLTx">
-                        <ref role="3cqZAo" node="DYlgnAA7yZ" resolve="ref" />
+                        <ref role="3cqZAo" node="2SR9xrsN2EK" resolve="ref" />
                       </node>
                       <node concept="3EllGN" id="DYlgnAA7yU" role="37vLTJ">
                         <node concept="2EnYce" id="DYlgnAA7yV" role="3ElVtu">
                           <node concept="2OqwBi" id="5RIakkDJOTu" role="2Oq$k0">
                             <node concept="CsP83" id="5RIakkDJOTv" role="2OqNvi" />
                             <node concept="37vLTw" id="5RIakkDJOTw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="DYlgnAA7yZ" resolve="ref" />
+                              <ref role="3cqZAo" node="2SR9xrsN2EK" resolve="ref" />
                             </node>
                           </node>
                           <node concept="liA8E" id="5RIakkDJOTx" role="2OqNvi">
@@ -2336,9 +2351,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="DYlgnAA7yZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2EK" role="1bW2Oz">
                   <property role="TrG5h" value="ref" />
-                  <node concept="2jxLKc" id="DYlgnAA7z0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2EL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2358,14 +2373,14 @@
                   <node concept="3clFbF" id="DYlgnAA7z9" role="3cqZAp">
                     <node concept="37vLTI" id="DYlgnAA7za" role="3clFbG">
                       <node concept="37vLTw" id="DYlgnAA7zb" role="37vLTx">
-                        <ref role="3cqZAo" node="DYlgnAA7zh" resolve="ref" />
+                        <ref role="3cqZAo" node="2SR9xrsN2EM" resolve="ref" />
                       </node>
                       <node concept="3EllGN" id="DYlgnAA7zc" role="37vLTJ">
                         <node concept="2EnYce" id="DYlgnAA7zd" role="3ElVtu">
                           <node concept="2OqwBi" id="5RIakkDJOTz" role="2Oq$k0">
                             <node concept="CsP83" id="5RIakkDJOT$" role="2OqNvi" />
                             <node concept="37vLTw" id="5RIakkDJOT_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="DYlgnAA7zh" resolve="ref" />
+                              <ref role="3cqZAo" node="2SR9xrsN2EM" resolve="ref" />
                             </node>
                           </node>
                           <node concept="liA8E" id="5RIakkDJOTA" role="2OqNvi">
@@ -2379,9 +2394,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="DYlgnAA7zh" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2EM" role="1bW2Oz">
                   <property role="TrG5h" value="ref" />
-                  <node concept="2jxLKc" id="DYlgnAA7zi" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2EN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2465,7 +2480,7 @@
                               <node concept="2OqwBi" id="4YRIhSKLMmu" role="3clFbG">
                                 <node concept="2OqwBi" id="4YRIhSKLIAj" role="2Oq$k0">
                                   <node concept="37vLTw" id="4YRIhSKLI8n" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4YRIhSKLH1Q" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EO" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4YRIhSKLKOB" role="2OqNvi">
                                     <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -2479,9 +2494,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4YRIhSKLH1Q" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2EO" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4YRIhSKLH1R" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2EP" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2491,15 +2506,12 @@
                         <node concept="3clFbS" id="5uUCR4LTuCC" role="1bW5cS">
                           <node concept="3clFbF" id="5uUCR4LTuCD" role="3cqZAp">
                             <node concept="1Wc70l" id="5uUCR4LTuCE" role="3clFbG">
-                              <node concept="17R0WA" id="E9Bg75f$QB" role="3uHU7B">
-                                <node concept="2GrUjf" id="E9Bg75fDPb" role="3uHU7w">
-                                  <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
-                                </node>
-                                <node concept="2OqwBi" id="5uUCR4LTuCG" role="3uHU7B">
+                              <node concept="2OqwBi" id="5uUCR4LTuCF" role="3uHU7B">
+                                <node concept="2OqwBi" id="5uUCR4LTuCG" role="2Oq$k0">
                                   <node concept="1PxgMI" id="4YRIhSKLSRf" role="2Oq$k0">
                                     <node concept="2OqwBi" id="4YRIhSKLQ8O" role="1m5AlR">
                                       <node concept="37vLTw" id="5uUCR4LTuCH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5uUCR4LTuCR" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2EQ" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4YRIhSKLREZ" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -2513,13 +2525,19 @@
                                     <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
                                   </node>
                                 </node>
+                                <node concept="liA8E" id="5uUCR4LTuCJ" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                  <node concept="2GrUjf" id="5uUCR4LTuCK" role="37wK5m">
+                                    <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
+                                  </node>
+                                </node>
                               </node>
                               <node concept="2OqwBi" id="5uUCR4LTuCL" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LTuCM" role="2Oq$k0">
                                   <node concept="1PxgMI" id="4YRIhSKM04k" role="2Oq$k0">
                                     <node concept="2OqwBi" id="4YRIhSKLX5r" role="1m5AlR">
                                       <node concept="37vLTw" id="5uUCR4LTuCN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5uUCR4LTuCR" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2EQ" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4YRIhSKLYQs" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -2542,9 +2560,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LTuCR" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2EQ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LTuCS" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2ER" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2607,7 +2625,7 @@
                                 <node concept="2OqwBi" id="4YRIhSKLjLC" role="3clFbG">
                                   <node concept="2OqwBi" id="4YRIhSKLg8P" role="2Oq$k0">
                                     <node concept="37vLTw" id="4YRIhSKLfGl" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4YRIhSKLeEk" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2ES" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4YRIhSKLiiD" role="2OqNvi">
                                       <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -2621,9 +2639,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4YRIhSKLeEk" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2ES" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4YRIhSKLeEl" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2ET" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2638,7 +2656,7 @@
                                     <node concept="1PxgMI" id="4YRIhSKL$QA" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4YRIhSKLwJn" role="1m5AlR">
                                         <node concept="37vLTw" id="5uUCR4LTuDr" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5uUCR4LTuD_" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2EU" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="4YRIhSKLz3U" role="2OqNvi">
                                           <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -2658,15 +2676,12 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="17R0WA" id="E9Bg75fN$M" role="3uHU7B">
-                                  <node concept="2GrUjf" id="E9Bg75fSLT" role="3uHU7w">
-                                    <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
-                                  </node>
-                                  <node concept="2OqwBi" id="5uUCR4LTuDw" role="3uHU7B">
+                                <node concept="2OqwBi" id="5uUCR4LTuDv" role="3uHU7B">
+                                  <node concept="2OqwBi" id="5uUCR4LTuDw" role="2Oq$k0">
                                     <node concept="1PxgMI" id="4YRIhSKLsIF" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4YRIhSKLoEK" role="1m5AlR">
                                         <node concept="37vLTw" id="5uUCR4LTuDx" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5uUCR4LTuD_" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2EU" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="4YRIhSKLqXB" role="2OqNvi">
                                           <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -2680,13 +2695,19 @@
                                       <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
                                     </node>
                                   </node>
+                                  <node concept="liA8E" id="5uUCR4LTuDz" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                    <node concept="2GrUjf" id="5uUCR4LTuD$" role="37wK5m">
+                                      <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5uUCR4LTuD_" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2EU" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5uUCR4LTuDA" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2EV" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2711,7 +2732,7 @@
                               <node concept="2OqwBi" id="5uUCR4LUFLm" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LUEs8" role="2Oq$k0">
                                   <node concept="37vLTw" id="5uUCR4LUEjP" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUC4O" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EW" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUFjT" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUFyP" role="3CFYIz">
@@ -2726,7 +2747,7 @@
                               <node concept="3y3z36" id="5uUCR4LUDK3" role="3uHU7B">
                                 <node concept="2OqwBi" id="5uUCR4LUCh6" role="3uHU7B">
                                   <node concept="37vLTw" id="5uUCR4LUCcg" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUC4O" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EW" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUD7O" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUDmW" role="3CFYIz">
@@ -2739,9 +2760,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LUC4O" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2EW" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LUC4P" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2EX" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2761,7 +2782,7 @@
                               <node concept="2OqwBi" id="5uUCR4LUHXx" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LUHXy" role="2Oq$k0">
                                   <node concept="37vLTw" id="5uUCR4LUHXz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUHXH" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EY" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUHX$" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUHX_" role="3CFYIz">
@@ -2776,7 +2797,7 @@
                               <node concept="3y3z36" id="5uUCR4LUHXB" role="3uHU7B">
                                 <node concept="2OqwBi" id="5uUCR4LUHXC" role="3uHU7B">
                                   <node concept="37vLTw" id="5uUCR4LUHXD" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LUHXH" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2EY" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LUHXE" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LUHXF" role="3CFYIz">
@@ -2789,9 +2810,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LUHXH" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2EY" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LUHXI" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2EZ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2839,27 +2860,30 @@
                     <node concept="1bVj0M" id="DYlgnAHaKd" role="23t8la">
                       <node concept="3clFbS" id="DYlgnAHaKe" role="1bW5cS">
                         <node concept="3clFbF" id="DYlgnAHaKf" role="3cqZAp">
-                          <node concept="17R0WA" id="E9Bg75f7yz" role="3clFbG">
-                            <node concept="2GrUjf" id="E9Bg75fctC" role="3uHU7w">
-                              <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
-                            </node>
-                            <node concept="2EnYce" id="DYlgnAHaKh" role="3uHU7B">
+                          <node concept="2OqwBi" id="DYlgnAHaKg" role="3clFbG">
+                            <node concept="2EnYce" id="DYlgnAHaKh" role="2Oq$k0">
                               <node concept="2OqwBi" id="5RIakkDJOTk" role="2Oq$k0">
                                 <node concept="CsP83" id="5RIakkDJOTl" role="2OqNvi" />
                                 <node concept="37vLTw" id="5RIakkDJOTm" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="DYlgnAHaKm" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2F0" resolve="it" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="5RIakkDJOTn" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
                               </node>
                             </node>
+                            <node concept="liA8E" id="DYlgnAHaKk" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                              <node concept="2GrUjf" id="DYlgnAHaKl" role="37wK5m">
+                                <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="DYlgnAHaKm" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2F0" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="DYlgnAHaKn" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2F1" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2881,27 +2905,30 @@
                     <node concept="1bVj0M" id="DYlgnAH9Sc" role="23t8la">
                       <node concept="3clFbS" id="DYlgnAH9Sd" role="1bW5cS">
                         <node concept="3clFbF" id="DYlgnAH9Se" role="3cqZAp">
-                          <node concept="17R0WA" id="E9Bg75flHO" role="3clFbG">
-                            <node concept="2GrUjf" id="E9Bg75fqCG" role="3uHU7w">
-                              <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
-                            </node>
-                            <node concept="2EnYce" id="DYlgnAH9Sg" role="3uHU7B">
+                          <node concept="2OqwBi" id="DYlgnAH9Sf" role="3clFbG">
+                            <node concept="2EnYce" id="DYlgnAH9Sg" role="2Oq$k0">
                               <node concept="2OqwBi" id="5RIakkDJOTp" role="2Oq$k0">
                                 <node concept="CsP83" id="5RIakkDJOTq" role="2OqNvi" />
                                 <node concept="37vLTw" id="5RIakkDJOTr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="DYlgnAH9Sl" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2F2" resolve="it" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="5RIakkDJOTs" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
                               </node>
                             </node>
+                            <node concept="liA8E" id="DYlgnAH9Sj" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                              <node concept="2GrUjf" id="DYlgnAH9Sk" role="37wK5m">
+                                <ref role="2Gs0qQ" node="DYlgnAA7zl" resolve="role" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="DYlgnAH9Sl" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2F2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="DYlgnAH9Sm" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2F3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3307,14 +3334,14 @@
           <ref role="3uigEE" node="494SuRWLRaN" resolve="MPSNodeComparisonResult" />
         </node>
       </node>
+      <node concept="3cqZAl" id="DYlgnAA7yq" role="3clF45" />
+      <node concept="3Tm6S6" id="DYlgnAA7yr" role="1B3o_S" />
       <node concept="37vLTG" id="E9Bg74JS8A" role="3clF46">
         <property role="TrG5h" value="options" />
         <node concept="3uibUv" id="E9Bg74JS8B" role="1tU5fm">
           <ref role="3uigEE" node="E9Bg74y9pX" resolve="MPSComparatorOptions" />
         </node>
       </node>
-      <node concept="3cqZAl" id="DYlgnAA7yq" role="3clF45" />
-      <node concept="3Tm6S6" id="DYlgnAA7yr" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6fymoI4WtMb" role="jymVt" />
     <node concept="2YIFZL" id="6fymoI4W7$J" role="jymVt">
@@ -3811,14 +3838,14 @@
           <ref role="3uigEE" node="494SuRWLRaN" resolve="MPSNodeComparisonResult" />
         </node>
       </node>
+      <node concept="3cqZAl" id="DYlgnAA7$z" role="3clF45" />
+      <node concept="3Tm6S6" id="DYlgnAA7$$" role="1B3o_S" />
       <node concept="37vLTG" id="E9Bg74P3Ha" role="3clF46">
         <property role="TrG5h" value="options" />
         <node concept="3uibUv" id="E9Bg74P7nj" role="1tU5fm">
           <ref role="3uigEE" node="E9Bg74y9pX" resolve="MPSComparatorOptions" />
         </node>
       </node>
-      <node concept="3cqZAl" id="DYlgnAA7$z" role="3clF45" />
-      <node concept="3Tm6S6" id="DYlgnAA7$$" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6fymoI4WMUq" role="jymVt" />
     <node concept="2YIFZL" id="6fymoI4WamM" role="jymVt">
@@ -3874,7 +3901,7 @@
                           <node concept="2EnYce" id="DYlgnAEWTP" role="3clFbG">
                             <node concept="2OqwBi" id="5RIakkDJOT7" role="2Oq$k0">
                               <node concept="37vLTw" id="5RIakkDJOT8" role="2Oq$k0">
-                                <ref role="3cqZAo" node="DYlgnAEWTS" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2F4" resolve="it" />
                               </node>
                               <node concept="2NL2c5" id="5RIakkDJOT9" role="2OqNvi" />
                             </node>
@@ -3884,9 +3911,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="DYlgnAEWTS" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2F4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="DYlgnAEWTT" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2F5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3918,7 +3945,7 @@
                           <node concept="2EnYce" id="DYlgnAFwul" role="3clFbG">
                             <node concept="2OqwBi" id="5RIakkDJOTc" role="2Oq$k0">
                               <node concept="37vLTw" id="5RIakkDJOTd" role="2Oq$k0">
-                                <ref role="3cqZAo" node="DYlgnAFwuo" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2F6" resolve="it" />
                               </node>
                               <node concept="2NL2c5" id="5RIakkDJOTe" role="2OqNvi" />
                             </node>
@@ -3928,9 +3955,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="DYlgnAFwuo" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2F6" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="DYlgnAFwup" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2F7" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3991,7 +4018,7 @@
                               <node concept="2OqwBi" id="4YRIhSKMSVQ" role="3clFbG">
                                 <node concept="2OqwBi" id="4YRIhSKNolW" role="2Oq$k0">
                                   <node concept="37vLTw" id="4YRIhSKMRZ_" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4YRIhSKMPR6" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2F8" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4YRIhSKNr4p" role="2OqNvi">
                                     <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -4005,9 +4032,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4YRIhSKMPR6" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2F8" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4YRIhSKMPR7" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2F9" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4017,15 +4044,12 @@
                         <node concept="3clFbS" id="5uUCR4LQ7L8" role="1bW5cS">
                           <node concept="3clFbF" id="5uUCR4LQ7Po" role="3cqZAp">
                             <node concept="1Wc70l" id="5uUCR4LQh7i" role="3clFbG">
-                              <node concept="17R0WA" id="E9Bg75gkdy" role="3uHU7B">
-                                <node concept="2GrUjf" id="E9Bg75gp6G" role="3uHU7w">
-                                  <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
-                                </node>
-                                <node concept="2OqwBi" id="5uUCR4LQ7YG" role="3uHU7B">
+                              <node concept="2OqwBi" id="5uUCR4LQaOo" role="3uHU7B">
+                                <node concept="2OqwBi" id="5uUCR4LQ7YG" role="2Oq$k0">
                                   <node concept="1PxgMI" id="4YRIhSKN4vv" role="2Oq$k0">
                                     <node concept="2OqwBi" id="4YRIhSKMZV3" role="1m5AlR">
                                       <node concept="37vLTw" id="5uUCR4LQ7Pn" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5uUCR4LQ7L9" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2Fa" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4YRIhSKN2vO" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -4039,13 +4063,19 @@
                                     <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
                                   </node>
                                 </node>
+                                <node concept="liA8E" id="5uUCR4LQdww" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                  <node concept="2GrUjf" id="5uUCR4LQdJ9" role="37wK5m">
+                                    <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
+                                  </node>
+                                </node>
                               </node>
                               <node concept="2OqwBi" id="5uUCR4LSI6J" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LSBFy" role="2Oq$k0">
                                   <node concept="1PxgMI" id="4YRIhSKNgRw" role="2Oq$k0">
                                     <node concept="2OqwBi" id="4YRIhSKNbOf" role="1m5AlR">
                                       <node concept="37vLTw" id="5uUCR4LS_$x" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5uUCR4LQ7L9" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2Fa" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4YRIhSKNeBs" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -4068,9 +4098,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LQ7L9" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Fa" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LQ7La" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Fb" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4133,7 +4163,7 @@
                                 <node concept="2OqwBi" id="4YRIhSKMfGv" role="3clFbG">
                                   <node concept="2OqwBi" id="4YRIhSKMcbE" role="2Oq$k0">
                                     <node concept="37vLTw" id="4YRIhSKMbgP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4YRIhSKM9cQ" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Fc" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4YRIhSKMeMl" role="2OqNvi">
                                       <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -4147,9 +4177,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4YRIhSKM9cQ" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2Fc" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4YRIhSKM9cR" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2Fd" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -4164,7 +4194,7 @@
                                     <node concept="1PxgMI" id="4YRIhSKMAM4" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4YRIhSKMy7A" role="1m5AlR">
                                         <node concept="37vLTw" id="5uUCR4LTdoG" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5uUCR4LQgv5" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2Fe" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="4YRIhSKM$Q5" role="2OqNvi">
                                           <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -4184,15 +4214,12 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="17R0WA" id="E9Bg75gyJU" role="3uHU7B">
-                                  <node concept="2GrUjf" id="E9Bg75gBCI" role="3uHU7w">
-                                    <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
-                                  </node>
-                                  <node concept="2OqwBi" id="5uUCR4LQgv0" role="3uHU7B">
+                                <node concept="2OqwBi" id="5uUCR4LQguZ" role="3uHU7B">
+                                  <node concept="2OqwBi" id="5uUCR4LQgv0" role="2Oq$k0">
                                     <node concept="1PxgMI" id="4YRIhSKMr10" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4YRIhSKMmmO" role="1m5AlR">
                                         <node concept="37vLTw" id="5uUCR4LQgv1" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5uUCR4LQgv5" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2Fe" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="4YRIhSKMoRT" role="2OqNvi">
                                           <ref role="3Tt5mk" to="8do3:5uUCR4L$O4e" resolve="ref" />
@@ -4206,13 +4233,19 @@
                                       <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
                                     </node>
                                   </node>
+                                  <node concept="liA8E" id="5uUCR4LQgv3" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                    <node concept="2GrUjf" id="5uUCR4LQgv4" role="37wK5m">
+                                      <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5uUCR4LQgv5" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2Fe" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5uUCR4LQgv6" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2Ff" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4237,7 +4270,7 @@
                               <node concept="2OqwBi" id="5uUCR4LWoG4" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LWmFi" role="2Oq$k0">
                                   <node concept="37vLTw" id="5uUCR4LWmsl" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LWj4U" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Fg" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LWnG1" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LWo3V" role="3CFYIz">
@@ -4252,7 +4285,7 @@
                               <node concept="3y3z36" id="5uUCR4LWlpu" role="3uHU7B">
                                 <node concept="2OqwBi" id="5uUCR4LWjtB" role="3uHU7B">
                                   <node concept="37vLTw" id="5uUCR4LWjls" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LWj4U" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Fg" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LWksq" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LWkOw" role="3CFYIz">
@@ -4265,9 +4298,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LWj4U" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Fg" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LWj4V" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Fh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4287,7 +4320,7 @@
                               <node concept="2OqwBi" id="5uUCR4LW7St" role="3uHU7w">
                                 <node concept="2OqwBi" id="5uUCR4LW6iL" role="2Oq$k0">
                                   <node concept="37vLTw" id="5uUCR4LW6au" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LW3x_" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Fi" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LW7au" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LW7pm" role="3CFYIz">
@@ -4302,7 +4335,7 @@
                               <node concept="3y3z36" id="5uUCR4LW5jo" role="3uHU7B">
                                 <node concept="2OqwBi" id="5uUCR4LW3HP" role="3uHU7B">
                                   <node concept="37vLTw" id="5uUCR4LW3CZ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5uUCR4LW3x_" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Fi" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="5uUCR4LW4zA" role="2OqNvi">
                                     <node concept="3CFYIy" id="5uUCR4LW4ME" role="3CFYIz">
@@ -4315,9 +4348,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uUCR4LW3x_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Fi" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uUCR4LW3xA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Fj" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4366,14 +4399,11 @@
                       <node concept="1bVj0M" id="DYlgnADtbs" role="23t8la">
                         <node concept="3clFbS" id="DYlgnADtbt" role="1bW5cS">
                           <node concept="3clFbF" id="DYlgnADtbu" role="3cqZAp">
-                            <node concept="17R0WA" id="E9Bg75gJFH" role="3clFbG">
-                              <node concept="2GrUjf" id="E9Bg75gPZJ" role="3uHU7w">
-                                <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
-                              </node>
-                              <node concept="2EnYce" id="DYlgnADtbw" role="3uHU7B">
+                            <node concept="2OqwBi" id="DYlgnADtbv" role="3clFbG">
+                              <node concept="2EnYce" id="DYlgnADtbw" role="2Oq$k0">
                                 <node concept="2OqwBi" id="5RIakkDJOSS" role="2Oq$k0">
                                   <node concept="37vLTw" id="5RIakkDJOST" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="DYlgnADtb_" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Fk" resolve="it" />
                                   </node>
                                   <node concept="2NL2c5" id="5RIakkDJOSU" role="2OqNvi" />
                                 </node>
@@ -4381,12 +4411,18 @@
                                   <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
                                 </node>
                               </node>
+                              <node concept="liA8E" id="DYlgnADtbz" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                <node concept="2GrUjf" id="DYlgnADtb$" role="37wK5m">
+                                  <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="DYlgnADtb_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Fk" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="DYlgnADtbA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Fl" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4411,14 +4447,11 @@
                       <node concept="1bVj0M" id="DYlgnADxRp" role="23t8la">
                         <node concept="3clFbS" id="DYlgnADxRq" role="1bW5cS">
                           <node concept="3clFbF" id="DYlgnADxRr" role="3cqZAp">
-                            <node concept="17R0WA" id="E9Bg75gYVm" role="3clFbG">
-                              <node concept="2GrUjf" id="E9Bg75h3Or" role="3uHU7w">
-                                <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
-                              </node>
-                              <node concept="2EnYce" id="DYlgnADxRt" role="3uHU7B">
+                            <node concept="2OqwBi" id="DYlgnADxRs" role="3clFbG">
+                              <node concept="2EnYce" id="DYlgnADxRt" role="2Oq$k0">
                                 <node concept="2OqwBi" id="5RIakkDJOSX" role="2Oq$k0">
                                   <node concept="37vLTw" id="5RIakkDJOSY" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="DYlgnADxRy" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Fm" resolve="it" />
                                   </node>
                                   <node concept="2NL2c5" id="5RIakkDJOSZ" role="2OqNvi" />
                                 </node>
@@ -4426,12 +4459,18 @@
                                   <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
                                 </node>
                               </node>
+                              <node concept="liA8E" id="DYlgnADxRw" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                <node concept="2GrUjf" id="DYlgnADxRx" role="37wK5m">
+                                  <ref role="2Gs0qQ" node="DYlgnAA7BI" resolve="role" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="DYlgnADxRy" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Fm" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="DYlgnADxRz" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Fn" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4741,14 +4780,14 @@
           <ref role="3uigEE" node="494SuRWLRaN" resolve="MPSNodeComparisonResult" />
         </node>
       </node>
+      <node concept="3cqZAl" id="DYlgnAA7Bi" role="3clF45" />
+      <node concept="3Tm6S6" id="DYlgnAA7Bj" role="1B3o_S" />
       <node concept="37vLTG" id="E9Bg74M7jI" role="3clF46">
         <property role="TrG5h" value="options" />
         <node concept="3uibUv" id="E9Bg74MdKx" role="1tU5fm">
           <ref role="3uigEE" node="E9Bg74y9pX" resolve="MPSComparatorOptions" />
         </node>
       </node>
-      <node concept="3cqZAl" id="DYlgnAA7Bi" role="3clF45" />
-      <node concept="3Tm6S6" id="DYlgnAA7Bj" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7ESlTHsaPlO" role="jymVt" />
     <node concept="2YIFZL" id="7ESlTHsaRAN" role="jymVt">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparisonResult.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparisonResult.mpsr
index cc688b6e13a..135c708b4e5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparisonResult.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparisonResult.mpsr
@@ -73,7 +73,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -88,7 +88,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -106,7 +106,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MapOfList.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MapOfList.mpsr
index 67f11578f91..d8d67534ba8 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MapOfList.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MapOfList.mpsr
@@ -77,7 +77,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,7 +95,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="3066917033203108594" name="jetbrains.mps.baseLanguage.structure.LocalInstanceMethodCall" flags="nn" index="3P9mCS" />
@@ -131,7 +131,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MissingReferenceDifference.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MissingReferenceDifference.mpsr
index 0f7fa51311a..40a618302ce 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MissingReferenceDifference.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MissingReferenceDifference.mpsr
@@ -111,6 +111,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -143,7 +144,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -314,7 +314,7 @@
                         <node concept="2OqwBi" id="5RIakkDJOTC" role="2Oq$k0">
                           <node concept="CsP83" id="5RIakkDJOTD" role="2OqNvi" />
                           <node concept="37vLTw" id="5RIakkDJOTE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="Pu8Vy2ctOZ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Fo" resolve="it" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5RIakkDJOTF" role="2OqNvi">
@@ -324,9 +324,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="Pu8Vy2ctOZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Fo" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="Pu8Vy2ctP0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Fp" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/StringUtils.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/StringUtils.mpsr
index 066cf612b9d..08885186973 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/StringUtils.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/StringUtils.mpsr
@@ -36,20 +36,20 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/com.mbeddr.mpsutil.compare.pattern.generator.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/com.mbeddr.mpsutil.compare.pattern.generator.runtime.msd
index f92f44f04bd..ee9b7125b9a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/com.mbeddr.mpsutil.compare.pattern.generator.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/com.mbeddr.mpsutil.compare.pattern.generator.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.compare.pattern.generator.runtime" uuid="98c9c105-d602-4d30-920f-ede2039bca65" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.compare.pattern.generator.runtime" uuid="98c9c105-d602-4d30-920f-ede2039bca65" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">5e650e02-4c45-4821-aabb-7fce53462924(com.mbeddr.mpsutil.compare.pattern.runtime)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/models/com/mbeddr/mpsutil/compare/pattern/generator/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/models/com/mbeddr/mpsutil/compare/pattern/generator/runtime/plugin.mps
index ea9a68ce85f..c12757fec42 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/models/com/mbeddr/mpsutil/compare/pattern/generator/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/models/com/mbeddr/mpsutil/compare/pattern/generator/runtime/plugin.mps
@@ -76,7 +76,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,13 +94,14 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -125,7 +126,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -136,7 +137,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225730411176" name="jetbrains.mps.baseLanguage.collections.structure.FindLastOperation" flags="nn" index="1zesIP" />
     </language>
   </registry>
@@ -325,7 +325,7 @@
                       <node concept="3fqX7Q" id="6Clmpmuh292" role="3uHU7w">
                         <node concept="2OqwBi" id="6Clmpmuh293" role="3fr31v">
                           <node concept="37vLTw" id="6Clmpmuh294" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Clmpmuh29e" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Fq" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="6Clmpmuh295" role="2OqNvi">
                             <node concept="chp4Y" id="6Clmpmuh296" role="cj9EA">
@@ -338,7 +338,7 @@
                         <node concept="2OqwBi" id="6Clmpmuh298" role="3fr31v">
                           <node concept="2OqwBi" id="6Clmpmuh299" role="2Oq$k0">
                             <node concept="37vLTw" id="6Clmpmuh29a" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Clmpmuh29e" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Fq" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="6Clmpmuh29b" role="2OqNvi" />
                           </node>
@@ -352,9 +352,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Clmpmuh29e" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Fq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Clmpmuh29f" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Fr" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/com.mbeddr.mpsutil.compare.pattern.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/com.mbeddr.mpsutil.compare.pattern.runtime.msd
index 27c9a099d90..50ad5f38829 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/com.mbeddr.mpsutil.compare.pattern.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/com.mbeddr.mpsutil.compare.pattern.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.compare.pattern.runtime" uuid="5e650e02-4c45-4821-aabb-7fce53462924" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.compare.pattern.runtime" uuid="5e650e02-4c45-4821-aabb-7fce53462924" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/models/com/mbeddr/mpsutil/compare/pattern/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/models/com/mbeddr/mpsutil/compare/pattern/runtime/plugin.mps
index 6097bdea006..ba2c19dc7f3 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/models/com/mbeddr/mpsutil/compare/pattern/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/models/com/mbeddr/mpsutil/compare/pattern/runtime/plugin.mps
@@ -46,7 +46,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -168,7 +168,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -195,7 +195,7 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="7024111702304501420" name="jetbrains.mps.baseLanguage.structure.XorAssignmentExpression" flags="nn" index="3vZ8rc" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -254,7 +254,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/com.mbeddr.mpsutil.contextactions.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/com.mbeddr.mpsutil.contextactions.runtime.msd
index 33bd253b287..cf909f4ce16 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/com.mbeddr.mpsutil.contextactions.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/com.mbeddr.mpsutil.contextactions.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.contextactions.runtime" uuid="28583149-5b6e-4663-9c02-b9a8fa3cb099" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.contextactions.runtime" uuid="28583149-5b6e-4663-9c02-b9a8fa3cb099" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
     <dependency reexport="false">7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime)</dependency>
@@ -30,14 +29,14 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps
index 0c11251a0f9..d85304e0e79 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps
@@ -6,7 +6,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@@ -74,6 +74,7 @@
     <import index="q4oi" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellActions(MPS.Editor/)" />
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
     <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -111,7 +112,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -273,7 +274,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -308,7 +309,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -360,6 +361,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -433,7 +435,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -501,7 +503,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -1370,7 +1371,7 @@
                     <node concept="3clFbF" id="5bKNAZ5eCKS" role="3cqZAp">
                       <node concept="2OqwBi" id="5bKNAZ5eCOh" role="3clFbG">
                         <node concept="37vLTw" id="5bKNAZ5eCKR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5bKNAZ5eCFd" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Fs" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5bKNAZ5eCTM" role="2OqNvi">
                           <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
@@ -1378,9 +1379,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5bKNAZ5eCFd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Fs" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5bKNAZ5eCFe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Ft" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2405,13 +2406,13 @@
                 <node concept="3clFbS" id="5lGdLibXHFv" role="1bW5cS">
                   <node concept="3clFbF" id="5lGdLibXHOO" role="3cqZAp">
                     <node concept="37vLTw" id="5lGdLibXHON" role="3clFbG">
-                      <ref role="3cqZAo" node="5lGdLibXHFw" resolve="it" />
+                      <ref role="3cqZAo" node="2SR9xrsN2Fu" resolve="it" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5lGdLibXHFw" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Fu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5lGdLibXHFx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Fv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3803,7 +3804,7 @@
                                     <node concept="3clFbF" id="4q$a58KyjLZ" role="3cqZAp">
                                       <node concept="2OqwBi" id="4q$a58KyjT0" role="3clFbG">
                                         <node concept="37vLTw" id="4q$a58KyjLY" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4q$a58KyizG" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2Fw" resolve="it" />
                                         </node>
                                         <node concept="2OwXpG" id="4q$a58Kylyv" role="2OqNvi">
                                           <ref role="2Oxat5" node="FmgK_vTOLV" resolve="myLabel" />
@@ -3811,9 +3812,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4q$a58KyizG" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2Fw" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4q$a58KyizH" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2Fx" role="1tU5fm" />
                                   </node>
                                 </node>
                                 <node concept="1nlBCl" id="4q$a58KyizI" role="2S7zOq">
@@ -3848,7 +3849,7 @@
                                                     <node concept="2OqwBi" id="7vUP_qcY_$1" role="3clFbG">
                                                       <node concept="2OqwBi" id="7vUP_qcYxyA" role="2Oq$k0">
                                                         <node concept="37vLTw" id="7vUP_qcYxoD" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="7vUP_qcYx79" resolve="it" />
+                                                          <ref role="3cqZAo" node="2SR9xrsN2Fy" resolve="it" />
                                                         </node>
                                                         <node concept="2OwXpG" id="7vUP_qcYzzB" role="2OqNvi">
                                                           <ref role="2Oxat5" node="FmgK_vTQ54" resolve="myAction" />
@@ -3863,9 +3864,9 @@
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="Rh6nW" id="7vUP_qcYx79" role="1bW2Oz">
+                                                <node concept="gl6BB" id="2SR9xrsN2Fy" role="1bW2Oz">
                                                   <property role="TrG5h" value="it" />
-                                                  <node concept="2jxLKc" id="7vUP_qcYx7a" role="1tU5fm" />
+                                                  <node concept="2jxLKc" id="2SR9xrsN2Fz" role="1tU5fm" />
                                                 </node>
                                               </node>
                                             </node>
@@ -5548,14 +5549,14 @@
                           <node concept="3y3z36" id="6W_V$ebkjwu" role="3clFbG">
                             <node concept="10Nm6u" id="6W_V$ebkjwv" role="3uHU7w" />
                             <node concept="37vLTw" id="6W_V$ebkjww" role="3uHU7B">
-                              <ref role="3cqZAo" node="6W_V$ebkjwx" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2F$" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6W_V$ebkjwx" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2F$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6W_V$ebkjwy" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2F_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5834,7 +5835,7 @@
                             <node concept="1pGfFk" id="4mMeETlxsVN" role="2ShVmc">
                               <ref role="37wK5l" node="4mMeETlxc3Q" resolve="SubstituteActionAdapter" />
                               <node concept="37vLTw" id="4mMeETlxtli" role="37wK5m">
-                                <ref role="3cqZAo" node="4mMeETlxpXR" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2FA" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -5844,9 +5845,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4mMeETlxpXR" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2FA" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4mMeETlxpXS" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2FB" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5865,7 +5866,7 @@
                                 <ref role="37wK5l" node="5lGdLibYv7n" resolve="SubstituteActionContextAction" />
                                 <node concept="3Tm1VV" id="vR6ln0lNgY" role="1B3o_S" />
                                 <node concept="37vLTw" id="5lGdLibZrTn" role="37wK5m">
-                                  <ref role="3cqZAo" node="5lGdLibZePi" resolve="action" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2FC" resolve="action" />
                                 </node>
                                 <node concept="3clFb_" id="vR6ln0lNwm" role="jymVt">
                                   <property role="1EzhhJ" value="false" />
@@ -5892,7 +5893,7 @@
                                             <node concept="1pGfFk" id="7vUP_qcuzPs" role="2ShVmc">
                                               <ref role="37wK5l" node="4mMeETlxc3Q" resolve="SubstituteActionAdapter" />
                                               <node concept="37vLTw" id="7vUP_qcu$9O" role="37wK5m">
-                                                <ref role="3cqZAo" node="5lGdLibZePi" resolve="action" />
+                                                <ref role="3cqZAo" node="2SR9xrsN2FC" resolve="action" />
                                               </node>
                                             </node>
                                           </node>
@@ -5976,10 +5977,10 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5lGdLibZePi" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2FC" role="1bW2Oz">
                     <property role="TrG5h" value="action" />
                     <property role="3TUv4t" value="true" />
-                    <node concept="2jxLKc" id="5lGdLibZePj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2FD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9232,13 +9233,13 @@
                   <node concept="3clFbF" id="4mMeETlvESN" role="3cqZAp">
                     <node concept="2OqwBi" id="6g_o1CJFL6z" role="3clFbG">
                       <node concept="2YIFZM" id="6g_o1CJFGLG" role="2Oq$k0">
-                        <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeRoot(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeRootContext)" resolve="checkCanBeRoot" />
-                        <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                        <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeRoot(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeRootContext)" resolve="checkCanBeRoot" />
+                        <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
                         <node concept="2ShNRf" id="6g_o1CJFIqi" role="37wK5m">
                           <node concept="1pGfFk" id="6g_o1CJFIdK" role="2ShVmc">
                             <ref role="37wK5l" to="pdwk:~CanBeRootContext.&lt;init&gt;(org.jetbrains.mps.openapi.language.SAbstractConcept,org.jetbrains.mps.openapi.model.SModel)" resolve="CanBeRootContext" />
                             <node concept="37vLTw" id="6g_o1CJFGLH" role="37wK5m">
-                              <ref role="3cqZAo" node="4mMeETlvCy7" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2FE" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="6g_o1CJFGLI" role="37wK5m">
                               <ref role="3cqZAo" node="Y7dDcER7i1" resolve="model" />
@@ -9252,9 +9253,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4mMeETlvCy7" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2FE" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4mMeETlvCy8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2FF" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9319,7 +9320,7 @@
                   <node concept="3clFbF" id="4mMeETlvsqw" role="3cqZAp">
                     <node concept="2OqwBi" id="4mMeETlvstf" role="3clFbG">
                       <node concept="37vLTw" id="4mMeETlvsqv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4mMeETlvs8Y" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2FG" resolve="it" />
                       </node>
                       <node concept="liA8E" id="4mMeETlvsJd" role="2OqNvi">
                         <ref role="37wK5l" to="c17a:~SLanguage.getConcepts()" resolve="getConcepts" />
@@ -9327,9 +9328,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4mMeETlvs8Y" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2FG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4mMeETlvs8Z" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2FH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9472,7 +9473,7 @@
                                 <ref role="37wK5l" node="Y7dDcEQQOJ" resolve="NewRootContextAction" />
                                 <node concept="3Tm1VV" id="Y7dDcEQDTs" role="1B3o_S" />
                                 <node concept="37vLTw" id="Y7dDcEQDTt" role="37wK5m">
-                                  <ref role="3cqZAo" node="Y7dDcEQDTK" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2FI" resolve="it" />
                                 </node>
                                 <node concept="3clFb_" id="Y7dDcEQDTu" role="jymVt">
                                   <property role="1EzhhJ" value="false" />
@@ -9529,9 +9530,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Y7dDcEQDTK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2FI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Y7dDcEQDTL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2FJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10314,7 +10315,7 @@
                           <node concept="1pGfFk" id="4mMeETlxfyT" role="2ShVmc">
                             <ref role="37wK5l" node="6W_V$eboIUd" resolve="SideTransformActionAdapter" />
                             <node concept="37vLTw" id="4mMeETlxg0u" role="37wK5m">
-                              <ref role="3cqZAo" node="4mMeETlx5ir" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2FK" resolve="it" />
                             </node>
                             <node concept="3clFbC" id="6W_V$eboXPP" role="37wK5m">
                               <node concept="37vLTw" id="7kaVzu2JKsF" role="3uHU7B">
@@ -10333,9 +10334,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4mMeETlx5ir" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2FK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4mMeETlx5is" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2FL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10354,7 +10355,7 @@
                               <ref role="37wK5l" node="5lGdLibYv7n" resolve="SubstituteActionContextAction" />
                               <node concept="3Tm1VV" id="4q$a58KssxC" role="1B3o_S" />
                               <node concept="37vLTw" id="4q$a58KssxD" role="37wK5m">
-                                <ref role="3cqZAo" node="4q$a58KssxY" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2FM" resolve="it" />
                               </node>
                               <node concept="3clFb_" id="4q$a58KssxE" role="jymVt">
                                 <property role="1EzhhJ" value="false" />
@@ -10380,7 +10381,7 @@
                                           <node concept="1pGfFk" id="7vUP_qcvZIV" role="2ShVmc">
                                             <ref role="37wK5l" node="6W_V$eboIUd" resolve="SideTransformActionAdapter" />
                                             <node concept="37vLTw" id="7vUP_qcvZSm" role="37wK5m">
-                                              <ref role="3cqZAo" node="4q$a58KssxY" resolve="it" />
+                                              <ref role="3cqZAo" node="2SR9xrsN2FM" resolve="it" />
                                             </node>
                                             <node concept="3clFbC" id="6W_V$eboS2L" role="37wK5m">
                                               <node concept="37vLTw" id="7kaVzu2JLsH" role="3uHU7B">
@@ -10498,10 +10499,10 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4q$a58KssxY" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2FM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
                   <property role="3TUv4t" value="true" />
-                  <node concept="2jxLKc" id="4q$a58KssxZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2FN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10696,16 +10697,16 @@
                               <node concept="liA8E" id="4Q7_LaEATjd" role="2OqNvi">
                                 <ref role="37wK5l" to="qkt:~ActionManager.isGroup(java.lang.String)" resolve="isGroup" />
                                 <node concept="37vLTw" id="4Q7_LaEATje" role="37wK5m">
-                                  <ref role="3cqZAo" node="4Q7_LaEATjf" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2FO" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4Q7_LaEATjf" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2FO" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4Q7_LaEATjg" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2FP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -10721,15 +10722,15 @@
                           <node concept="liA8E" id="4Q7_LaEATjn" role="2OqNvi">
                             <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
                             <node concept="37vLTw" id="4Q7_LaEATjo" role="37wK5m">
-                              <ref role="3cqZAo" node="4Q7_LaEATjp" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2FQ" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4Q7_LaEATjp" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2FQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4Q7_LaEATjq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2FR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10742,7 +10743,7 @@
                         <node concept="3y3z36" id="4mMeETlqpDY" role="3uHU7B">
                           <node concept="10Nm6u" id="4mMeETlqq1s" role="3uHU7w" />
                           <node concept="37vLTw" id="4mMeETlqmUL" role="3uHU7B">
-                            <ref role="3cqZAo" node="4Q7_LaEAVL2" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2FS" resolve="it" />
                           </node>
                         </node>
                         <node concept="3fqX7Q" id="4Q7_LaEAVW7" role="3uHU7w">
@@ -10751,16 +10752,16 @@
                               <ref role="3uigEE" to="obo9:~LabelledAnchor" resolve="LabelledAnchor" />
                             </node>
                             <node concept="37vLTw" id="4Q7_LaEAVWa" role="2ZW6bz">
-                              <ref role="3cqZAo" node="4Q7_LaEAVL2" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2FS" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4Q7_LaEAVL2" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2FS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4Q7_LaEAVL3" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2FT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10786,7 +10787,7 @@
                         <node concept="1pGfFk" id="4q$a58Kvac6" role="2ShVmc">
                           <ref role="37wK5l" node="4q$a58KtPZ_" resolve="IdeaAction" />
                           <node concept="37vLTw" id="4q$a58Kvac7" role="37wK5m">
-                            <ref role="3cqZAo" node="4q$a58KudcX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2FU" resolve="it" />
                           </node>
                           <node concept="37vLTw" id="4q$a58Kvac8" role="37wK5m">
                             <ref role="3cqZAo" node="4q$a58KupQP" resolve="folder" />
@@ -10801,9 +10802,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4q$a58KudcX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2FU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4q$a58KudcY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2FV" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12766,14 +12767,14 @@
                     <node concept="1rXfSq" id="6W_V$ebhmwJ" role="3clFbG">
                       <ref role="37wK5l" node="6W_V$ebhiKJ" resolve="createAction" />
                       <node concept="37vLTw" id="6W_V$ebhm_p" role="37wK5m">
-                        <ref role="3cqZAo" node="4mMeETlzuw7" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2FW" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4mMeETlzuw7" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2FW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4mMeETlzuw8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2FX" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14556,7 +14557,7 @@
                           <node concept="2EnYce" id="7vUP_qcTIn9" role="3clFbG">
                             <node concept="2OqwBi" id="7vUP_qcTIna" role="2Oq$k0">
                               <node concept="37vLTw" id="7vUP_qcTInb" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7vUP_qcTIne" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2FY" resolve="it" />
                               </node>
                               <node concept="liA8E" id="7vUP_qcTInc" role="2OqNvi">
                                 <ref role="37wK5l" to="2kyo:~JBTabsImpl.getSelectedInfo()" resolve="getSelectedInfo" />
@@ -14568,9 +14569,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7vUP_qcTIne" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2FY" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7vUP_qcTInf" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2FZ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -14582,14 +14583,14 @@
                         <node concept="3y3z36" id="7vUP_qcTInk" role="3clFbG">
                           <node concept="10Nm6u" id="7vUP_qcTInl" role="3uHU7w" />
                           <node concept="37vLTw" id="7vUP_qcTInm" role="3uHU7B">
-                            <ref role="3cqZAo" node="7vUP_qcTInn" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2G0" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7vUP_qcTInn" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2G0" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7vUP_qcTIno" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2G1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -14634,7 +14635,7 @@
                             <node concept="1rXfSq" id="7vUP_qcUcRt" role="10QFUP">
                               <ref role="37wK5l" node="1b5aB8eFZrI" resolve="findDescendantAWTComponent" />
                               <node concept="37vLTw" id="7vUP_qcTInJ" role="37wK5m">
-                                <ref role="3cqZAo" node="7vUP_qcTIo0" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2G2" resolve="it" />
                               </node>
                               <node concept="2ShNRf" id="7vUP_qcTInK" role="37wK5m">
                                 <node concept="YeOm9" id="7vUP_qcTInL" role="2ShVmc">
@@ -14681,9 +14682,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7vUP_qcTIo0" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2G2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7vUP_qcTIo1" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2G3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -14695,14 +14696,14 @@
                         <node concept="3y3z36" id="7vUP_qcTIo6" role="3clFbG">
                           <node concept="10Nm6u" id="7vUP_qcTIo7" role="3uHU7w" />
                           <node concept="37vLTw" id="7vUP_qcTIo8" role="3uHU7B">
-                            <ref role="3cqZAo" node="7vUP_qcTIo9" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2G4" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7vUP_qcTIo9" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2G4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7vUP_qcTIoa" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2G5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -15202,7 +15203,7 @@
                           <node concept="2OqwBi" id="657q32pEz8g" role="2Oq$k0">
                             <node concept="2OqwBi" id="657q32pEz8h" role="2Oq$k0">
                               <node concept="37vLTw" id="657q32pEz8i" role="2Oq$k0">
-                                <ref role="3cqZAo" node="657q32pEz8r" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2G6" resolve="it" />
                               </node>
                               <node concept="2OwXpG" id="657q32pEz8j" role="2OqNvi">
                                 <ref role="2Oxat5" to="18ew:~Pair.o1" resolve="o1" />
@@ -15231,9 +15232,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="657q32pEz8r" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2G6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="657q32pEz8s" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2G7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -15252,7 +15253,7 @@
                           <ref role="37wK5l" node="657q32pEPmM" resolve="IntentionAdapter" />
                           <node concept="2OqwBi" id="1Pes$C0M8cs" role="37wK5m">
                             <node concept="37vLTw" id="1Pes$C0M8ct" role="2Oq$k0">
-                              <ref role="3cqZAo" node="657q32pE$Ru" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2G8" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="1Pes$C0M8cu" role="2OqNvi">
                               <ref role="2Oxat5" to="18ew:~Pair.o1" resolve="o1" />
@@ -15260,7 +15261,7 @@
                           </node>
                           <node concept="2OqwBi" id="1Pes$C0M8cv" role="37wK5m">
                             <node concept="37vLTw" id="1Pes$C0M8cw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="657q32pE$Ru" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2G8" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="1Pes$C0M8cx" role="2OqNvi">
                               <ref role="2Oxat5" to="18ew:~Pair.o2" resolve="o2" />
@@ -15316,7 +15317,7 @@
                           <ref role="37wK5l" node="657q32pCBen" resolve="IntentionAction" />
                           <node concept="2OqwBi" id="657q32pF7B4" role="37wK5m">
                             <node concept="37vLTw" id="657q32pF7B5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="657q32pE$Ru" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2G8" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="657q32pF7B6" role="2OqNvi">
                               <ref role="2Oxat5" to="18ew:~Pair.o1" resolve="o1" />
@@ -15324,7 +15325,7 @@
                           </node>
                           <node concept="2OqwBi" id="657q32pF7B7" role="37wK5m">
                             <node concept="37vLTw" id="657q32pF7B8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="657q32pE$Ru" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2G8" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="657q32pF7B9" role="2OqNvi">
                               <ref role="2Oxat5" to="18ew:~Pair.o2" resolve="o2" />
@@ -15358,9 +15359,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="657q32pE$Ru" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2G8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="657q32pE$Rv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2G9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -15910,7 +15911,7 @@
                       <node concept="3clFbF" id="6W_V$eaPZ4I" role="3cqZAp">
                         <node concept="2OqwBi" id="6W_V$eaPZdE" role="3clFbG">
                           <node concept="37vLTw" id="6W_V$eaPZ4H" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6W_V$eaPYVL" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ga" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6W_V$eaQ3Gj" role="2OqNvi">
                             <ref role="37wK5l" node="4mMeETlskaR" resolve="isApplicable" />
@@ -15921,9 +15922,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6W_V$eaPYVL" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Ga" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6W_V$eaPYVM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Gb" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -15934,7 +15935,7 @@
                     <node concept="3clFbF" id="6W_V$eaPxwi" role="3cqZAp">
                       <node concept="2OqwBi" id="6W_V$eaPxAV" role="3clFbG">
                         <node concept="37vLTw" id="6W_V$eaPxwh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6W_V$eaPxoQ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Gc" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6W_V$eaPA3I" role="2OqNvi">
                           <ref role="37wK5l" node="5tr7YH$UwV6" resolve="getActions" />
@@ -15945,9 +15946,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6W_V$eaPxoQ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Gc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6W_V$eaPxoR" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Gd" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -15959,14 +15960,14 @@
                     <node concept="1rXfSq" id="6W_V$eaT4hI" role="3clFbG">
                       <ref role="37wK5l" node="6W_V$eaSZOB" resolve="wrap" />
                       <node concept="37vLTw" id="6W_V$eaT4r3" role="37wK5m">
-                        <ref role="3cqZAo" node="6W_V$eaOX_G" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Ge" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6W_V$eaOX_G" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ge" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6W_V$eaOX_H" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Gf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -16622,7 +16623,15 @@
               <node concept="2OqwBi" id="JGR5whwagc" role="37wK5m">
                 <node concept="2YIFZM" id="JGR5whwa4Q" role="2Oq$k0">
                   <ref role="1Pybhc" to="y38:3dEPKBAxz0O" resolve="RefactoringAccess" />
-                  <ref role="37wK5l" to="y38:1dH5fOG2bPt" resolve="getInstance" />
+                  <ref role="37wK5l" to="y38:4xB7mi2r8bh" resolve="getInstance" />
+                  <node concept="2OqwBi" id="1Tx15Z6r2c" role="37wK5m">
+                    <node concept="37vLTw" id="1Tx15Z6r2d" role="2Oq$k0">
+                      <ref role="3cqZAo" node="54sr1JE5aDU" resolve="context" />
+                    </node>
+                    <node concept="liA8E" id="1Tx15Z6r2e" role="2OqNvi">
+                      <ref role="37wK5l" node="5tr7YH$Uyow" resolve="getProject" />
+                    </node>
+                  </node>
                 </node>
                 <node concept="liA8E" id="JGR5whwarc" role="2OqNvi">
                   <ref role="37wK5l" to="y38:10tOJLdhm35" resolve="getRefactoringByClassName" />
@@ -16799,8 +16808,16 @@
           <node concept="2OqwBi" id="54sr1JE5GDc" role="3clFbG">
             <node concept="2OqwBi" id="54sr1JE5G8F" role="2Oq$k0">
               <node concept="2YIFZM" id="54sr1JE5FEL" role="2Oq$k0">
-                <ref role="37wK5l" to="y38:1dH5fOG2bPt" resolve="getInstance" />
+                <ref role="37wK5l" to="y38:4xB7mi2r8bh" resolve="getInstance" />
                 <ref role="1Pybhc" to="y38:3dEPKBAxz0O" resolve="RefactoringAccess" />
+                <node concept="2OqwBi" id="1Tx15Z6l7K" role="37wK5m">
+                  <node concept="37vLTw" id="1Tx15Z6ksM" role="2Oq$k0">
+                    <ref role="3cqZAo" node="54sr1JE5c7k" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="1Tx15Z6nl0" role="2OqNvi">
+                    <ref role="37wK5l" node="5tr7YH$Uyow" resolve="getProject" />
+                  </node>
+                </node>
               </node>
               <node concept="liA8E" id="54sr1JE5G_b" role="2OqNvi">
                 <ref role="37wK5l" to="y38:52KjdOfLP8s" resolve="getRefactoringFacade" />
@@ -16977,8 +16994,16 @@
         <node concept="3clFbF" id="2hz1PZpK7bw" role="3cqZAp">
           <node concept="2OqwBi" id="4glh_DchKrX" role="3clFbG">
             <node concept="2YIFZM" id="4glh_DchKBz" role="2Oq$k0">
-              <ref role="37wK5l" to="y38:1dH5fOG2bPt" resolve="getInstance" />
+              <ref role="37wK5l" to="y38:4xB7mi2r8bh" resolve="getInstance" />
               <ref role="1Pybhc" to="y38:3dEPKBAxz0O" resolve="RefactoringAccess" />
+              <node concept="2OqwBi" id="1Tx15Z6pjV" role="37wK5m">
+                <node concept="37vLTw" id="1Tx15Z6pjW" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2hz1PZpKbJ0" resolve="context" />
+                </node>
+                <node concept="liA8E" id="1Tx15Z6pjX" role="2OqNvi">
+                  <ref role="37wK5l" node="5tr7YH$Uyow" resolve="getProject" />
+                </node>
+              </node>
             </node>
             <node concept="liA8E" id="4glh_DchL6I" role="2OqNvi">
               <ref role="37wK5l" to="y38:10tOJLdi0g7" resolve="isApplicable" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps
index 307b9ce21ef..273fc88e9c6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps
@@ -2,13 +2,13 @@
 <model ref="r:7db2f202-2a6e-4f79-9d01-79eb67397dc9(com.mbeddr.mpsutil.contextactions.runtime.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
     <import index="kvq8" ref="r:2e938759-cfd0-47cd-9046-896d85204f59(de.slisson.mps.hacks.editor)" />
@@ -84,7 +84,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -149,7 +149,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -170,7 +170,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -192,13 +192,13 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/com.mbeddr.mpsutil.dataflow.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/com.mbeddr.mpsutil.dataflow.runtime.msd
index 6810956d1ac..73eea25184b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/com.mbeddr.mpsutil.dataflow.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/com.mbeddr.mpsutil.dataflow.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.dataflow.runtime" uuid="a28465ca-fa05-4dd6-ad81-d2ce1a342cb0" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.dataflow.runtime" uuid="a28465ca-fa05-4dd6-ad81-d2ce1a342cb0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
@@ -22,7 +21,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/models/com/mbeddr/mpsutil/dataflow/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/models/com/mbeddr/mpsutil/dataflow/runtime/plugin.mps
index d0c4bb02b31..d22514b66d9 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/models/com/mbeddr/mpsutil/dataflow/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.runtime/models/com/mbeddr/mpsutil/dataflow/runtime/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
@@ -44,7 +44,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -106,7 +106,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -176,7 +176,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -202,7 +202,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -267,7 +267,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -12499,7 +12499,7 @@
               <node concept="liA8E" id="ELXCaNg72A" role="2OqNvi">
                 <ref role="37wK5l" node="5xyoMgvtJLa" resolve="get" />
                 <node concept="1rXfSq" id="4qZ_JW_D_fD" role="37wK5m">
-                  <ref role="37wK5l" to="9fia:3yaa4ph8uKc" resolve="getJumpTo" />
+                  <ref role="37wK5l" to="9fia:3yaa4ph8uQa" resolve="getJumpTo" />
                 </node>
               </node>
             </node>
@@ -12532,7 +12532,7 @@
               <node concept="liA8E" id="ELXCaNg7rR" role="2OqNvi">
                 <ref role="37wK5l" node="5xyoMgvtJLa" resolve="get" />
                 <node concept="1rXfSq" id="4qZ_JW_D_$T" role="37wK5m">
-                  <ref role="37wK5l" to="9fia:3yaa4ph8uKc" resolve="getJumpTo" />
+                  <ref role="37wK5l" to="9fia:3yaa4ph8uQa" resolve="getJumpTo" />
                 </node>
               </node>
             </node>
@@ -12602,7 +12602,7 @@
                     <node concept="liA8E" id="183c22F17UU" role="2OqNvi">
                       <ref role="37wK5l" node="5xyoMgvtJLa" resolve="get" />
                       <node concept="1rXfSq" id="4qZ_JW_D_T0" role="37wK5m">
-                        <ref role="37wK5l" to="9fia:3yaa4ph8uKc" resolve="getJumpTo" />
+                        <ref role="37wK5l" to="9fia:3yaa4ph8uQa" resolve="getJumpTo" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/com.mbeddr.mpsutil.dataflow.ui.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/com.mbeddr.mpsutil.dataflow.ui.msd
index 9bb1f6a5970..bd4ecd923cb 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/com.mbeddr.mpsutil.dataflow.ui.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/com.mbeddr.mpsutil.dataflow.ui.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.dataflow.ui" uuid="acc1f724-624c-43b2-998a-71c39acc0405" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.dataflow.ui" uuid="acc1f724-624c-43b2-998a-71c39acc0405" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
@@ -29,10 +28,10 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps
index 044297b2be6..2704869e66d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -50,6 +50,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1211298967294" name="outsideCommandExecution" index="72QZ$" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -72,7 +73,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -96,7 +97,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -159,7 +160,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -226,7 +227,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -250,7 +251,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
@@ -274,7 +275,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -306,7 +307,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -2522,6 +2523,7 @@
     <property role="72QZ$" value="true" />
     <property role="2uzpH1" value="Show Augmented Inter-procedural Data Flow Graph" />
     <property role="3GE5qa" value="ui" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4KLDMqoMqsO" role="tncku">
       <node concept="3clFbS" id="4KLDMqoMqsP" role="2VODD2">
         <node concept="3cpWs8" id="4KLDMqoOncy" role="3cqZAp">
@@ -3143,6 +3145,7 @@
     <property role="72QZ$" value="true" />
     <property role="2uzpH1" value="Show Inter-procedural Data Flow Graph" />
     <property role="3GE5qa" value="ui" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4KDfkUwM7DY" role="tncku">
       <node concept="3clFbS" id="4KDfkUwM7DZ" role="2VODD2">
         <node concept="3cpWs8" id="4KDfkUwM7E0" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd
index da6d86628d6..08cc11223f2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.datepicker.runtime" uuid="98a7bbe2-0ea1-4503-9fc1-9efb7b48c6ea" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.datepicker.runtime" uuid="98a7bbe2-0ea1-4503-9fc1-9efb7b48c6ea" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,12 +11,9 @@
   <facets>
     <facet type="java" languageLevel="JAVA_9" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/microba-0.4.4.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/microba-0.4.4.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -27,7 +24,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps
index c2a8acdc8fe..2e88aaa4303 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -61,7 +61,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -182,7 +182,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -209,7 +209,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -254,7 +254,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.sandbox.demo/com.mbeddr.mpsutil.datepicker.sandbox.demo.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.sandbox.demo/com.mbeddr.mpsutil.datepicker.sandbox.demo.msd
index 31961ae5269..198d90ff996 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.sandbox.demo/com.mbeddr.mpsutil.datepicker.sandbox.demo.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.sandbox.demo/com.mbeddr.mpsutil.datepicker.sandbox.demo.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.datepicker.sandbox.demo" uuid="f2ad8487-2b08-46d8-b61d-0a5562b64349" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.datepicker.sandbox.demo" uuid="f2ad8487-2b08-46d8-b61d-0a5562b64349" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:27e888f7-20c7-4b89-9a66-3c9207e0608b:com.mbeddr.mpsutil.datepicker.sandbox" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/com.mbeddr.mpsutil.dependenciesdiagram.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/com.mbeddr.mpsutil.dependenciesdiagram.sandbox.msd
index 9949a4d92ff..703e51e4e0a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/com.mbeddr.mpsutil.dependenciesdiagram.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/com.mbeddr.mpsutil.dependenciesdiagram.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.dependenciesdiagram.sandbox" uuid="59f08a74-912d-4ab0-b1cc-24111469d2e3" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.dependenciesdiagram.sandbox" uuid="59f08a74-912d-4ab0-b1cc-24111469d2e3" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:cab214f9-7127-4f03-923a-c64fb67fed05:com.mbeddr.mpsutil.dependenciesdiagram" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd
index 80ba7565c73..003b730cb53 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ecore.runtime" uuid="3852b093-b918-413a-91e0-ba454bb21921" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ecore.runtime" uuid="3852b093-b918-413a-91e0-ba454bb21921" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">822a7acd-f487-45f5-bbb9-1ce595a1705f(com.mbeddr.mpsutil.ecore.stubs)</dependency>
     <dependency reexport="false">77948de3-6ef9-452d-b392-d01403e4086f(com.mbeddr.mpsutil.ecore)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:3eada220-3310-4fd3-b794-ff924add7d8a:com.mbeddr.mpsutil.smodule" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps
index bae02cbbe2f..ce6fa5ee143 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="3eada220-3310-4fd3-b794-ff924add7d8a" name="com.mbeddr.mpsutil.smodule" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
@@ -47,8 +47,8 @@
     <import index="dr5r" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.logging(JDK/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
-    <import index="e8bb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.ids(MPS.Core/)" />
     <import index="xx25" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.structure.types(MPS.Core/)" />
+    <import index="e8bb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.ids(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -291,6 +291,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
         <child id="1200830928149" name="expression" index="2n6tg2" />
       </concept>
@@ -1262,7 +1263,7 @@
                           <node concept="2OqwBi" id="60d$i5skSte" role="3clFbG">
                             <node concept="2OqwBi" id="60d$i5skStf" role="2Oq$k0">
                               <node concept="37vLTw" id="60d$i5skStg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="60d$i5skStk" resolve="p" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Gg" resolve="p" />
                               </node>
                               <node concept="3TrcHB" id="60d$i5skSth" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpce:dqwjwHwEjp" resolve="propertyId" />
@@ -1277,9 +1278,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="60d$i5skStk" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Gg" role="1bW2Oz">
                         <property role="TrG5h" value="p" />
-                        <node concept="2jxLKc" id="60d$i5skStl" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Gh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1305,7 +1306,7 @@
                               <node concept="2OqwBi" id="60d$i5skStx" role="3clFbG">
                                 <node concept="2OqwBi" id="60d$i5skSty" role="2Oq$k0">
                                   <node concept="37vLTw" id="60d$i5skStz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="60d$i5skStD" resolve="e" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Gi" resolve="e" />
                                   </node>
                                   <node concept="3TrcHB" id="60d$i5skSt$" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1325,9 +1326,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="60d$i5skStD" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2Gi" role="1bW2Oz">
                             <property role="TrG5h" value="e" />
-                            <node concept="2jxLKc" id="60d$i5skStE" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2Gj" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1435,7 +1436,7 @@
                           <node concept="2OqwBi" id="60d$i5ssItc" role="3clFbG">
                             <node concept="2OqwBi" id="60d$i5ssItd" role="2Oq$k0">
                               <node concept="37vLTw" id="60d$i5ssIte" role="2Oq$k0">
-                                <ref role="3cqZAo" node="60d$i5ssIti" resolve="conceptDecl" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Gk" resolve="conceptDecl" />
                               </node>
                               <node concept="3TrcHB" id="60d$i5ssItf" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1450,9 +1451,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="60d$i5ssIti" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Gk" role="1bW2Oz">
                         <property role="TrG5h" value="conceptDecl" />
-                        <node concept="2jxLKc" id="60d$i5ssItj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Gl" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1614,7 +1615,7 @@
                               <node concept="2OqwBi" id="60d$i5ssORg" role="3clFbG">
                                 <node concept="2OqwBi" id="60d$i5ssORh" role="2Oq$k0">
                                   <node concept="37vLTw" id="60d$i5ssORi" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="60d$i5ssORo" resolve="classDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Gm" resolve="classDecl" />
                                   </node>
                                   <node concept="3TrcHB" id="60d$i5ssORj" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1634,9 +1635,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="60d$i5ssORo" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2Gm" role="1bW2Oz">
                             <property role="TrG5h" value="classDecl" />
-                            <node concept="2jxLKc" id="60d$i5ssORp" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2Gn" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1780,7 +1781,7 @@
                           <node concept="2OqwBi" id="60d$i5ssUFd" role="3clFbG">
                             <node concept="2OqwBi" id="60d$i5ssUFe" role="2Oq$k0">
                               <node concept="37vLTw" id="60d$i5ssUFf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="60d$i5ssUFj" resolve="conceptDecl" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Go" resolve="conceptDecl" />
                               </node>
                               <node concept="3TrcHB" id="60d$i5ssUFg" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1795,9 +1796,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="60d$i5ssUFj" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Go" role="1bW2Oz">
                         <property role="TrG5h" value="conceptDecl" />
-                        <node concept="2jxLKc" id="60d$i5ssUFk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Gp" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1830,7 +1831,7 @@
                               <node concept="2OqwBi" id="60d$i5st0xU" role="3clFbG">
                                 <node concept="2OqwBi" id="60d$i5st0xV" role="2Oq$k0">
                                   <node concept="37vLTw" id="60d$i5st0xW" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="60d$i5st0y2" resolve="conceptDecl" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Gq" resolve="conceptDecl" />
                                   </node>
                                   <node concept="3TrcHB" id="60d$i5st0xX" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1850,9 +1851,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="60d$i5st0y2" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2Gq" role="1bW2Oz">
                             <property role="TrG5h" value="conceptDecl" />
-                            <node concept="2jxLKc" id="60d$i5st0y3" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2Gr" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3318,15 +3319,15 @@
                       </node>
                       <node concept="TSZUe" id="60d$i5sl7$V" role="2OqNvi">
                         <node concept="37vLTw" id="60d$i5sl7$W" role="25WWJ7">
-                          <ref role="3cqZAo" node="60d$i5sl7$X" resolve="property" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Gs" resolve="property" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="60d$i5sl7$X" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Gs" role="1bW2Oz">
                   <property role="TrG5h" value="property" />
-                  <node concept="2jxLKc" id="60d$i5sl7$Y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Gt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3357,15 +3358,15 @@
                       </node>
                       <node concept="TSZUe" id="60d$i5sl7_c" role="2OqNvi">
                         <node concept="37vLTw" id="60d$i5sl7_d" role="25WWJ7">
-                          <ref role="3cqZAo" node="60d$i5sl7_e" resolve="child" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Gu" resolve="child" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="60d$i5sl7_e" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Gu" role="1bW2Oz">
                   <property role="TrG5h" value="child" />
-                  <node concept="2jxLKc" id="60d$i5sl7_f" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Gv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3822,7 +3823,7 @@
                           </node>
                           <node concept="2OqwBi" id="110SXBDiqog" role="3uHU7B">
                             <node concept="37vLTw" id="110SXBDiq22" role="2Oq$k0">
-                              <ref role="3cqZAo" node="110SXBDip4g" resolve="conceptDeclaration" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Gw" resolve="conceptDeclaration" />
                             </node>
                             <node concept="3TrcHB" id="110SXBDiqUu" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3831,9 +3832,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="110SXBDip4g" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Gw" role="1bW2Oz">
                       <property role="TrG5h" value="conceptDeclaration" />
-                      <node concept="2jxLKc" id="110SXBDip4h" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Gx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8490,6 +8491,54 @@
           <node concept="2GrKxI" id="4XUUgAlkzm_" role="2Gsz3X">
             <property role="TrG5h" value="property" />
           </node>
+          <node concept="2OqwBi" id="4JHJliLKrHU" role="2GsD0m">
+            <node concept="1rXfSq" id="RLDPQVqeOa" role="2Oq$k0">
+              <ref role="37wK5l" node="RLDPQVf3CH" resolve="propertiesOfConcept" />
+              <node concept="2OqwBi" id="4JHJliLGIAG" role="37wK5m">
+                <node concept="37vLTw" id="RLDPQVqlOJ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4XUUgAlktoZ" resolve="nod" />
+                </node>
+                <node concept="2yIwOk" id="4JHJliLGQQO" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3zZkjj" id="4JHJliLK$fQ" role="2OqNvi">
+              <node concept="1bVj0M" id="4JHJliLK$fS" role="23t8la">
+                <node concept="3clFbS" id="4JHJliLK$fT" role="1bW5cS">
+                  <node concept="3clFbF" id="4JHJliLKErK" role="3cqZAp">
+                    <node concept="22lmx$" id="4JHJliLKErM" role="3clFbG">
+                      <node concept="2OqwBi" id="4JHJliLKErN" role="3uHU7B">
+                        <node concept="37vLTw" id="4JHJliLKErO" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4JHJliLHRJ9" resolve="propertiesOfNode" />
+                        </node>
+                        <node concept="3JPx81" id="4JHJliLKErP" role="2OqNvi">
+                          <node concept="37vLTw" id="4JHJliLKL6f" role="25WWJ7">
+                            <ref role="3cqZAo" node="4JHJliLK$fU" resolve="it" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2ZW3vV" id="4JHJliLKErR" role="3uHU7w">
+                        <node concept="3uibUv" id="4JHJliLKErS" role="2ZW6by">
+                          <ref role="3uigEE" to="c17a:~SEnumeration" resolve="SEnumeration" />
+                        </node>
+                        <node concept="2OqwBi" id="4JHJliLKErT" role="2ZW6bz">
+                          <node concept="37vLTw" id="4JHJliLKSxQ" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4JHJliLK$fU" resolve="it" />
+                          </node>
+                          <node concept="liA8E" id="4JHJliLKErV" role="2OqNvi">
+                            <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="4JHJliLK$fU" role="1bW2Oz">
+                  <property role="TrG5h" value="p" />
+                  <node concept="2jxLKc" id="4JHJliLK$fV" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbS" id="4XUUgAlkzmB" role="2LFqv$">
             <node concept="3SKdUt" id="4JHJliLLlbW" role="3cqZAp">
               <node concept="1PaTwC" id="4JHJliLLlbX" role="1aUNEU">
@@ -9101,54 +9150,6 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="4JHJliLKrHU" role="2GsD0m">
-            <node concept="1rXfSq" id="RLDPQVqeOa" role="2Oq$k0">
-              <ref role="37wK5l" node="RLDPQVf3CH" resolve="propertiesOfConcept" />
-              <node concept="2OqwBi" id="4JHJliLGIAG" role="37wK5m">
-                <node concept="37vLTw" id="RLDPQVqlOJ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4XUUgAlktoZ" resolve="nod" />
-                </node>
-                <node concept="2yIwOk" id="4JHJliLGQQO" role="2OqNvi" />
-              </node>
-            </node>
-            <node concept="3zZkjj" id="4JHJliLK$fQ" role="2OqNvi">
-              <node concept="1bVj0M" id="4JHJliLK$fS" role="23t8la">
-                <node concept="3clFbS" id="4JHJliLK$fT" role="1bW5cS">
-                  <node concept="3clFbF" id="4JHJliLKErK" role="3cqZAp">
-                    <node concept="22lmx$" id="4JHJliLKErM" role="3clFbG">
-                      <node concept="2OqwBi" id="4JHJliLKErN" role="3uHU7B">
-                        <node concept="37vLTw" id="4JHJliLKErO" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4JHJliLHRJ9" resolve="propertiesOfNode" />
-                        </node>
-                        <node concept="3JPx81" id="4JHJliLKErP" role="2OqNvi">
-                          <node concept="37vLTw" id="4JHJliLKL6f" role="25WWJ7">
-                            <ref role="3cqZAo" node="4JHJliLK$fU" resolve="it" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2ZW3vV" id="4JHJliLKErR" role="3uHU7w">
-                        <node concept="3uibUv" id="4JHJliLKErS" role="2ZW6by">
-                          <ref role="3uigEE" to="c17a:~SEnumeration" resolve="SEnumeration" />
-                        </node>
-                        <node concept="2OqwBi" id="4JHJliLKErT" role="2ZW6bz">
-                          <node concept="37vLTw" id="4JHJliLKSxQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4JHJliLK$fU" resolve="it" />
-                          </node>
-                          <node concept="liA8E" id="4JHJliLKErV" role="2OqNvi">
-                            <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="4JHJliLK$fU" role="1bW2Oz">
-                  <property role="TrG5h" value="p" />
-                  <node concept="2jxLKc" id="4JHJliLK$fV" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
       </node>
       <node concept="3Tm6S6" id="4XUUgAlkqWB" role="1B3o_S" />
@@ -11474,7 +11475,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="2W468ixjYa6" role="3uHU7B">
                                   <node concept="37vLTw" id="2W468ixjXqz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2W468ixjUAh" resolve="cd" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2Gy" resolve="cd" />
                                   </node>
                                   <node concept="3TrcHB" id="2W468ixjYQp" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -11483,9 +11484,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2W468ixjUAh" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2Gy" role="1bW2Oz">
                             <property role="TrG5h" value="cd" />
-                            <node concept="2jxLKc" id="2W468ixjUAi" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2Gz" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -11854,7 +11855,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5AqTiJm5LAp" role="3uHU7B">
                                   <node concept="37vLTw" id="5AqTiJm5LAq" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5AqTiJm5LAs" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2G$" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="5AqTiJm5LAr" role="2OqNvi">
                                     <ref role="37wK5l" to="c17a:~SEnumerationLiteral.getPresentation()" resolve="getPresentation" />
@@ -11863,9 +11864,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5AqTiJm5LAs" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2G$" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5AqTiJm5LAt" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2G_" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -13941,7 +13942,7 @@
                       <node concept="17QB3L" id="375LOh7iIRc" role="1tU5fm" />
                       <node concept="2OqwBi" id="375LOh7iJDS" role="33vP2m">
                         <node concept="37vLTw" id="375LOh7iJqm" role="2Oq$k0">
-                          <ref role="3cqZAo" node="375LOh7iF5a" resolve="mpsRootNode" />
+                          <ref role="3cqZAo" node="2SR9xrsN2GA" resolve="mpsRootNode" />
                         </node>
                         <node concept="3TrcHB" id="375LOh7iJZ9" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -14024,7 +14025,7 @@
                       <node concept="3clFbF" id="375LOh7j9Ug" role="3cqZAp">
                         <node concept="2OqwBi" id="375LOh7jaib" role="3clFbG">
                           <node concept="37vLTw" id="375LOh7j9Ue" role="2Oq$k0">
-                            <ref role="3cqZAo" node="375LOh7iF5a" resolve="mpsRootNode" />
+                            <ref role="3cqZAo" node="2SR9xrsN2GA" resolve="mpsRootNode" />
                           </node>
                           <node concept="3YRAZt" id="375LOh7jcf4" role="2OqNvi" />
                         </node>
@@ -14037,9 +14038,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="375LOh7iF5a" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2GA" role="1bW2Oz">
                   <property role="TrG5h" value="mpsRootNode" />
-                  <node concept="2jxLKc" id="375LOh7iF5b" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2GB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14109,7 +14110,7 @@
                         <ref role="3uigEE" to="62x7:~EClassImpl" resolve="EClassImpl" />
                       </node>
                       <node concept="37vLTw" id="375LOh7n63O" role="2ZW6bz">
-                        <ref role="3cqZAo" node="375LOh7n649" resolve="eContent" />
+                        <ref role="3cqZAo" node="2SR9xrsN2GC" resolve="eContent" />
                       </node>
                     </node>
                     <node concept="3clFbS" id="375LOh7n63P" role="3clFbx">
@@ -14125,7 +14126,7 @@
                                 <ref role="3uigEE" to="62x7:~EClassImpl" resolve="EClassImpl" />
                               </node>
                               <node concept="37vLTw" id="375LOh7n63W" role="10QFUP">
-                                <ref role="3cqZAo" node="375LOh7n649" resolve="eContent" />
+                                <ref role="3cqZAo" node="2SR9xrsN2GC" resolve="eContent" />
                               </node>
                             </node>
                           </node>
@@ -14138,7 +14139,7 @@
                           <ref role="3uigEE" to="62x7:~EEnumImpl" resolve="EEnumImpl" />
                         </node>
                         <node concept="37vLTw" id="375LOh7n640" role="2ZW6bz">
-                          <ref role="3cqZAo" node="375LOh7n649" resolve="eContent" />
+                          <ref role="3cqZAo" node="2SR9xrsN2GC" resolve="eContent" />
                         </node>
                       </node>
                       <node concept="3clFbS" id="375LOh7n641" role="3eOfB_">
@@ -14154,7 +14155,7 @@
                                   <ref role="3uigEE" to="62x7:~EEnumImpl" resolve="EEnumImpl" />
                                 </node>
                                 <node concept="37vLTw" id="375LOh7n648" role="10QFUP">
-                                  <ref role="3cqZAo" node="375LOh7n649" resolve="eContent" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2GC" resolve="eContent" />
                                 </node>
                               </node>
                             </node>
@@ -14164,9 +14165,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="375LOh7n649" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2GC" role="1bW2Oz">
                   <property role="TrG5h" value="eContent" />
-                  <node concept="2jxLKc" id="375LOh7n64a" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2GD" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -14320,7 +14321,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="375LOh7hKG5" role="3uHU7B">
                                   <node concept="37vLTw" id="375LOh7hKsk" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="375LOh7hKcX" resolve="mpsRootNode" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2GE" resolve="mpsRootNode" />
                                   </node>
                                   <node concept="3TrcHB" id="375LOh7hL1J" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -14329,9 +14330,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="375LOh7hKcX" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2GE" role="1bW2Oz">
                             <property role="TrG5h" value="mpsRootNode" />
-                            <node concept="2jxLKc" id="375LOh7hKcY" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2GF" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -14883,7 +14884,7 @@
                             <node concept="2OqwBi" id="4zxiNljm5Wi" role="3uHU7B">
                               <node concept="2OqwBi" id="4zxiNljm5Wj" role="2Oq$k0">
                                 <node concept="37vLTw" id="4zxiNljm5Wk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4zxiNljm5Wn" resolve="ifInMPS" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2GG" resolve="ifInMPS" />
                                 </node>
                                 <node concept="3TrEf2" id="4zxiNljm5Wl" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -14896,9 +14897,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4zxiNljm5Wn" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2GG" role="1bW2Oz">
                         <property role="TrG5h" value="ifInMPS" />
-                        <node concept="2jxLKc" id="4zxiNljm5Wo" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2GH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -14966,7 +14967,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4zxiNljm5WH" role="3uHU7B">
                                   <node concept="37vLTw" id="4zxiNljm5WI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4zxiNljm5WK" resolve="interfaceDeclaration" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2GI" resolve="interfaceDeclaration" />
                                   </node>
                                   <node concept="3TrcHB" id="4zxiNljm5WJ" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -14975,9 +14976,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4zxiNljm5WK" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2GI" role="1bW2Oz">
                             <property role="TrG5h" value="interfaceDeclaration" />
-                            <node concept="2jxLKc" id="4zxiNljm5WL" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2GJ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -15046,7 +15047,7 @@
                           <node concept="2OqwBi" id="4zxiNljm5Xe" role="3uHU7w">
                             <node concept="2OqwBi" id="4zxiNljm5Xf" role="2Oq$k0">
                               <node concept="37vLTw" id="4zxiNljm5Xg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4zxiNljm5XA" resolve="ifInMPS" />
+                                <ref role="3cqZAo" node="2SR9xrsN2GK" resolve="ifInMPS" />
                               </node>
                               <node concept="3TrEf2" id="4zxiNljm5Xh" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -15094,7 +15095,7 @@
                           </node>
                           <node concept="3dhRuq" id="4zxiNljm5Xy" role="2OqNvi">
                             <node concept="37vLTw" id="4zxiNljm5Xz" role="25WWJ7">
-                              <ref role="3cqZAo" node="4zxiNljm5XA" resolve="ifInMPS" />
+                              <ref role="3cqZAo" node="2SR9xrsN2GK" resolve="ifInMPS" />
                             </node>
                           </node>
                         </node>
@@ -15107,9 +15108,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4zxiNljm5XA" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2GK" role="1bW2Oz">
                   <property role="TrG5h" value="ifInMPS" />
-                  <node concept="2jxLKc" id="4zxiNljm5XB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2GL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -15429,7 +15430,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="787c44ufc$m" role="3uHU7B">
                                     <node concept="37vLTw" id="787c44ufc$n" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="787c44ufc$p" resolve="conceptDeclaration" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2GM" resolve="conceptDeclaration" />
                                     </node>
                                     <node concept="3TrcHB" id="787c44ufc$o" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -15438,9 +15439,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="787c44ufc$p" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2GM" role="1bW2Oz">
                               <property role="TrG5h" value="conceptDeclaration" />
-                              <node concept="2jxLKc" id="787c44ufc$q" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2GN" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -15527,7 +15528,7 @@
                             <node concept="2OqwBi" id="4zxiNljiGaj" role="3uHU7B">
                               <node concept="2OqwBi" id="4zxiNljiFmP" role="2Oq$k0">
                                 <node concept="37vLTw" id="4zxiNljiDXG" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4zxiNljiDlI" resolve="ifInMPS" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2GO" resolve="ifInMPS" />
                                 </node>
                                 <node concept="3TrEf2" id="4zxiNljiFCk" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -15540,9 +15541,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4zxiNljiDlI" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2GO" role="1bW2Oz">
                         <property role="TrG5h" value="ifInMPS" />
-                        <node concept="2jxLKc" id="4zxiNljiDlJ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2GP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -15610,7 +15611,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4zxiNljjy_a" role="3uHU7B">
                                   <node concept="37vLTw" id="4zxiNljjy_b" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4zxiNljjy_d" resolve="interfaceDeclaration" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2GQ" resolve="interfaceDeclaration" />
                                   </node>
                                   <node concept="3TrcHB" id="4zxiNljjy_c" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -15619,9 +15620,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4zxiNljjy_d" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2GQ" role="1bW2Oz">
                             <property role="TrG5h" value="interfaceDeclaration" />
-                            <node concept="2jxLKc" id="4zxiNljjy_e" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2GR" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -15690,7 +15691,7 @@
                           <node concept="2OqwBi" id="4zxiNljjUhL" role="3uHU7w">
                             <node concept="2OqwBi" id="4zxiNljjTlW" role="2Oq$k0">
                               <node concept="37vLTw" id="4zxiNljjSYj" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4zxiNljjKKs" resolve="ifInMPS" />
+                                <ref role="3cqZAo" node="2SR9xrsN2GS" resolve="ifInMPS" />
                               </node>
                               <node concept="3TrEf2" id="4zxiNljjTLa" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpce:h0PrY0D" resolve="intfc" />
@@ -15738,7 +15739,7 @@
                           </node>
                           <node concept="3dhRuq" id="4zxiNljk8LR" role="2OqNvi">
                             <node concept="37vLTw" id="4zxiNljka0S" role="25WWJ7">
-                              <ref role="3cqZAo" node="4zxiNljjKKs" resolve="ifInMPS" />
+                              <ref role="3cqZAo" node="2SR9xrsN2GS" resolve="ifInMPS" />
                             </node>
                           </node>
                         </node>
@@ -15751,9 +15752,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4zxiNljjKKs" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2GS" role="1bW2Oz">
                   <property role="TrG5h" value="ifInMPS" />
-                  <node concept="2jxLKc" id="4zxiNljjKKt" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2GT" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/com.mbeddr.mpsutil.ecore.testing.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/com.mbeddr.mpsutil.ecore.testing.runtime.msd
index 16dab75c00e..9f1071ddc86 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/com.mbeddr.mpsutil.ecore.testing.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/com.mbeddr.mpsutil.ecore.testing.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ecore.testing.runtime" uuid="53f72aed-03c9-433e-8bca-b0a0c1ec0c31" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ecore.testing.runtime" uuid="53f72aed-03c9-433e-8bca-b0a0c1ec0c31" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)</dependency>
@@ -24,7 +23,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps
index 5f9d495b719..a91e1c59a50 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
   </languages>
   <imports>
@@ -174,6 +174,7 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -306,22 +307,22 @@
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
       <property role="eg7rD" value="false" />
+      <node concept="3Tm6S6" id="7ESlTHs1PHO" role="1B3o_S" />
       <node concept="_YKpA" id="5Ap$XSr2BHq" role="1tU5fm">
         <node concept="3uibUv" id="5Ap$XSr2BHs" role="_ZDj9">
           <ref role="3uigEE" to="mqum:DYlgnA$re5" resolve="NodeDifference" />
         </node>
       </node>
-      <node concept="3Tm6S6" id="7ESlTHs1PHO" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="7ESlTHs1QyV" role="jymVt">
       <property role="TrG5h" value="undiscoveredRoots" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
       <property role="eg7rD" value="false" />
+      <node concept="3Tm6S6" id="7ESlTHs1QyY" role="1B3o_S" />
       <node concept="_YKpA" id="5Ap$XSr2DCy" role="1tU5fm">
         <node concept="17QB3L" id="5Ap$XSr2DC$" role="_ZDj9" />
       </node>
-      <node concept="3Tm6S6" id="7ESlTHs1QyY" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="5Ap$XSqZbMR" role="jymVt" />
     <node concept="3clFb_" id="7ESlTHs1S27" role="jymVt">
@@ -1319,18 +1320,6 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="4JHJliM10Rk" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4JHJliLYXa3" role="8Wnug">
-            <node concept="1rXfSq" id="4JHJliLYXa1" role="3clFbG">
-              <ref role="37wK5l" node="4JHJliLYRdU" resolve="dumpFile" />
-              <node concept="37vLTw" id="4JHJliLYY8D" role="37wK5m">
-                <ref role="3cqZAo" node="2UFbgC3naH7" resolve="tempFile" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbH" id="4JHJliM16GI" role="3cqZAp" />
         <node concept="3SKdUt" id="4JHJliM1gK8" role="3cqZAp">
           <node concept="1PaTwC" id="4JHJliM1gK9" role="1aUNEU">
@@ -1624,9 +1613,6 @@
         </node>
         <node concept="3clFbF" id="1XBwKttg4W_" role="3cqZAp">
           <node concept="2OqwBi" id="1XBwKttg6vF" role="3clFbG">
-            <node concept="37vLTw" id="4JHJliM48Yk" role="2Oq$k0">
-              <ref role="3cqZAo" node="4JHJliM48Yg" resolve="differences" />
-            </node>
             <node concept="2es0OD" id="1XBwKttg8vC" role="2OqNvi">
               <node concept="1bVj0M" id="1XBwKttg8vE" role="23t8la">
                 <node concept="3clFbS" id="1XBwKttg8vF" role="1bW5cS">
@@ -1640,7 +1626,7 @@
                         <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                         <node concept="2OqwBi" id="1XBwKttgtOm" role="37wK5m">
                           <node concept="37vLTw" id="1XBwKttg9x7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1XBwKttg8vG" resolve="diff" />
+                            <ref role="3cqZAo" node="2SR9xrsN2GU" resolve="diff" />
                           </node>
                           <node concept="liA8E" id="1XBwKttgu8d" role="2OqNvi">
                             <ref role="37wK5l" to="mqum:DYlgnA$vsr" resolve="getDescription" />
@@ -1650,12 +1636,15 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1XBwKttg8vG" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2GU" role="1bW2Oz">
                   <property role="TrG5h" value="diff" />
-                  <node concept="2jxLKc" id="1XBwKttg8vH" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2GV" role="1tU5fm" />
                 </node>
               </node>
             </node>
+            <node concept="37vLTw" id="4JHJliM48Yk" role="2Oq$k0">
+              <ref role="3cqZAo" node="4JHJliM48Yg" resolve="differences" />
+            </node>
           </node>
         </node>
         <node concept="3vwNmj" id="4JHJliM7QEF" role="3cqZAp">
@@ -1671,9 +1660,20 @@
             </node>
           </node>
         </node>
+        <node concept="1X3_iC" id="4JHJliM10Rk" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3clFbF" id="4JHJliLYXa3" role="8Wnug">
+            <node concept="1rXfSq" id="4JHJliLYXa1" role="3clFbG">
+              <ref role="37wK5l" node="4JHJliLYRdU" resolve="dumpFile" />
+              <node concept="37vLTw" id="4JHJliLYY8D" role="37wK5m">
+                <ref role="3cqZAo" node="2UFbgC3naH7" resolve="tempFile" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="4MUcKNHlR4W" role="1B3o_S" />
-      <node concept="3cqZAl" id="4JHJliM1YFN" role="3clF45" />
       <node concept="37vLTG" id="4MUcKNHlRB6" role="3clF46">
         <property role="TrG5h" value="pathToEMFMetaModel" />
         <node concept="17QB3L" id="4MUcKNHlRB5" role="1tU5fm" />
@@ -1686,6 +1686,7 @@
         <property role="TrG5h" value="mpsModelInstance" />
         <node concept="H_c77" id="4MUcKNHlRWW" role="1tU5fm" />
       </node>
+      <node concept="3cqZAl" id="4JHJliM1YFN" role="3clF45" />
     </node>
     <node concept="2tJIrI" id="4MUcKNHlT43" role="jymVt" />
     <node concept="2YIFZL" id="1XBwKttgJOH" role="jymVt">
@@ -1838,7 +1839,7 @@
                       </node>
                       <node concept="2OqwBi" id="2W468ixlQNA" role="3uHU7B">
                         <node concept="37vLTw" id="2W468ixlQz1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2W468ixlQ3u" resolve="language" />
+                          <ref role="3cqZAo" node="2SR9xrsN2GW" resolve="language" />
                         </node>
                         <node concept="liA8E" id="2W468ixlQVO" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
@@ -1847,9 +1848,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2W468ixlQ3u" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2GW" role="1bW2Oz">
                   <property role="TrG5h" value="language" />
-                  <node concept="2jxLKc" id="2W468ixlQ3v" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2GX" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/com.mbeddr.mpsutil.ecore.ui.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/com.mbeddr.mpsutil.ecore.ui.msd
index d90f146b56d..1d77d945c9c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/com.mbeddr.mpsutil.ecore.ui.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/com.mbeddr.mpsutil.ecore.ui.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ecore.ui" uuid="eb3ff167-aa45-42e9-9297-313fbfce587f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ecore.ui" uuid="eb3ff167-aa45-42e9-9297-313fbfce587f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -24,12 +23,12 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps
index 919447e2f4d..9cd726b30ba 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps
@@ -5,8 +5,8 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@@ -43,6 +43,7 @@
         <property id="1211298967294" name="outsideCommandExecution" index="72QZ$" />
         <property id="1215865999894" name="mnemonic" index="ngHcd" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -77,7 +78,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -98,7 +99,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -178,7 +179,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -200,7 +201,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -224,6 +225,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -247,7 +249,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -261,7 +263,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -277,7 +279,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
@@ -1254,7 +1255,7 @@
                       </node>
                       <node concept="2OqwBi" id="2W468ixlQNA" role="3uHU7B">
                         <node concept="37vLTw" id="2W468ixlQz1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2W468ixlQ3u" resolve="language" />
+                          <ref role="3cqZAo" node="2SR9xrsN2GY" resolve="language" />
                         </node>
                         <node concept="liA8E" id="2W468ixlQVO" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
@@ -1263,9 +1264,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2W468ixlQ3u" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2GY" role="1bW2Oz">
                   <property role="TrG5h" value="language" />
-                  <node concept="2jxLKc" id="2W468ixlQ3v" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2GZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1636,6 +1637,7 @@
     <property role="2uzpH1" value="Export Ecore Model (mps model to xml file)" />
     <property role="ngHcd" value="x" />
     <property role="72QZ$" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2CLKXjMmk71" role="tncku">
       <node concept="3clFbS" id="2CLKXjMmk72" role="2VODD2">
         <node concept="3clFbF" id="57zF9H8KUfk" role="3cqZAp">
@@ -1695,6 +1697,7 @@
     <property role="2uzpH1" value="Import Ecore Metamodel (ecore file to mps language structure)" />
     <property role="ngHcd" value="E" />
     <property role="72QZ$" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6TiIOkR_RTp" role="tncku">
       <node concept="3clFbS" id="6TiIOkR_RTq" role="2VODD2">
         <node concept="3clFbF" id="1a1uQDXH5v7" role="3cqZAp">
@@ -1755,6 +1758,7 @@
     <property role="2uzpH1" value="Import Ecore Model (from xml file to mps model)" />
     <property role="ngHcd" value="I" />
     <property role="72QZ$" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="5uaEgp6nCtJ" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels.msd
index cfb469f846f..a5fa4225aa6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels/com.mbeddr.mpsutil.ecoremodelimportexporttestmodels.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ecoremodelimportexporttestmodels" uuid="80e9de8b-7846-4282-b71c-8c52cac58567" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ecoremodelimportexporttestmodels" uuid="80e9de8b-7846-4282-b71c-8c52cac58567" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:98309aa4-0aee-4c83-b79a-2ab22ee75043:test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1" version="-1" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd
index d2ae6ca21d9..d99c0d7175d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.ecore.stubs" uuid="822a7acd-f487-45f5-bbb9-1ce595a1705f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.ecore.stubs" uuid="822a7acd-f487-45f5-bbb9-1ce595a1705f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -60,61 +60,58 @@
   <facets>
     <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/com.google.guava-15.0.0.v201403281430.jar" />
+      <library location="${module}/lib/com.google.inject-3.0.0.v201605172100.jar" />
+      <library location="${module}/lib/com.ibm.icu-56.1.0.v201601250100.jar" />
+      <library location="${module}/lib/javax.inject-1.0.0.v20091030.jar" />
+      <library location="${module}/lib/org.antlr.runtime-3.2.0.v201101311130.jar" />
+      <library location="${module}/lib/org.apache.commons.cli-1.2.0.v201404270220.jar" />
+      <library location="${module}/lib/org.apache.commons.lang-2.6.0.v201404270220.jar" />
+      <library location="${module}/lib/org.apache.commons.logging-1.1.1.v201101211721.jar" />
+      <library location="${module}/lib/org.eclipse.core.commands-3.8.0.v20160316-1921.jar" />
+      <library location="${module}/lib/org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar" />
+      <library location="${module}/lib/org.eclipse.core.expressions-3.5.100.v20160418-1621.jar" />
+      <library location="${module}/lib/org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar" />
+      <library location="${module}/lib/org.eclipse.core.jobs-3.8.0.v20160509-0411.jar" />
+      <library location="${module}/lib/org.eclipse.core.resources-3.11.0.v20160503-1608.jar" />
+      <library location="${module}/lib/org.eclipse.core.runtime-3.12.0.v20160606-1342.jar" />
+      <library location="${module}/lib/org.eclipse.core.variables-3.3.0.v20160419-1720.jar" />
+      <library location="${module}/lib/org.eclipse.debug.core-3.10.100.v20160419-1720.jar" />
+      <library location="${module}/lib/org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar" />
+      <library location="${module}/lib/org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar" />
+      <library location="${module}/lib/org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar" />
+      <library location="${module}/lib/org.eclipse.emf.common_2.10.1.v20150123-0348.jar" />
+      <library location="${module}/lib/org.eclipse.emf.ecore.xcore-1.4.0.v20160526-0606.jar" />
+      <library location="${module}/lib/org.eclipse.emf.ecore.xcore.lib-1.1.100.v20160526-0606.jar" />
+      <library location="${module}/lib/org.eclipse.emf.ecore.xmi_2.10.2.v20150123-0348.jar" />
+      <library location="${module}/lib/org.eclipse.emf.ecore_2.10.2.v20150123-0348.jar" />
+      <library location="${module}/lib/org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar" />
+      <library location="${module}/lib/org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar" />
+      <library location="${module}/lib/org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar" />
+      <library location="${module}/lib/org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar" />
+      <library location="${module}/lib/org.eclipse.equinox.app-1.3.400.v20150715-1528.jar" />
+      <library location="${module}/lib/org.eclipse.equinox.common-3.8.0.v20160509-1230.jar" />
+      <library location="${module}/lib/org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar" />
+      <library location="${module}/lib/org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar" />
+      <library location="${module}/lib/org.eclipse.jdt.core-3.12.0.v20160516-2131.jar" />
+      <library location="${module}/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar" />
+      <library location="${module}/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar" />
+      <library location="${module}/lib/org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar" />
+      <library location="${module}/lib/org.eclipse.osgi-3.11.0.v20160603-1336.jar" />
+      <library location="${module}/lib/org.eclipse.text-3.6.0.v20160503-1849.jar" />
+      <library location="${module}/lib/org.eclipse.xtend-2.2.0.v201605260315.jar" />
+      <library location="${module}/lib/org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar" />
+      <library location="${module}/lib/org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar" />
+      <library location="${module}/lib/org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar" />
+      <library location="${module}/lib/org.eclipse.xtext-2.11.0.v20170130-0808.jar" />
+      <library location="${module}/lib/org.eclipse.xtext.common.types-2.11.0.v20170131-1210.jar" />
+      <library location="${module}/lib/org.eclipse.xtext.ecore-2.11.0.v20170131-1210.jar" />
+      <library location="${module}/lib/org.eclipse.xtext.util-2.11.0.v20170130-0808.jar" />
+      <library location="${module}/lib/org.eclipse.xtext.xbase-2.11.0.v20170131-1210.jar" />
+      <library location="${module}/lib/org.eclipse.xtext.xbase.lib-2.11.0.v20170124-1424.jar" />
+      <library location="${module}/lib/org.objectweb.asm-5.0.1.v201404251740.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/com.google.guava-15.0.0.v201403281430.jar" />
-    <stubModelEntry path="${module}/lib/com.google.inject-3.0.0.v201605172100.jar" />
-    <stubModelEntry path="${module}/lib/com.ibm.icu-56.1.0.v201601250100.jar" />
-    <stubModelEntry path="${module}/lib/javax.inject-1.0.0.v20091030.jar" />
-    <stubModelEntry path="${module}/lib/org.antlr.runtime-3.2.0.v201101311130.jar" />
-    <stubModelEntry path="${module}/lib/org.apache.commons.cli-1.2.0.v201404270220.jar" />
-    <stubModelEntry path="${module}/lib/org.apache.commons.lang-2.6.0.v201404270220.jar" />
-    <stubModelEntry path="${module}/lib/org.apache.commons.logging-1.1.1.v201101211721.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.commands-3.8.0.v20160316-1921.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.expressions-3.5.100.v20160418-1621.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.jobs-3.8.0.v20160509-0411.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.resources-3.11.0.v20160503-1608.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.runtime-3.12.0.v20160606-1342.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.variables-3.3.0.v20160419-1720.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.debug.core-3.10.100.v20160419-1720.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.common_2.10.1.v20150123-0348.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xcore-1.4.0.v20160526-0606.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xcore.lib-1.1.100.v20160526-0606.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xmi_2.10.2.v20150123-0348.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore_2.10.2.v20150123-0348.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.equinox.app-1.3.400.v20150715-1528.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.equinox.common-3.8.0.v20160509-1230.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.core-3.12.0.v20160516-2131.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.osgi-3.11.0.v20160603-1336.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.text-3.6.0.v20160503-1849.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend-2.2.0.v201605260315.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtext-2.11.0.v20170130-0808.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtext.common.types-2.11.0.v20170131-1210.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtext.ecore-2.11.0.v20170131-1210.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtext.util-2.11.0.v20170130-0808.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtext.xbase-2.11.0.v20170131-1210.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtext.xbase.lib-2.11.0.v20170124-1424.jar" />
-    <stubModelEntry path="${module}/lib/org.objectweb.asm-5.0.1.v201404251740.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd
index de1da2ea1f5..45b0929dc25 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.editingGuide.execution" uuid="28182ab7-63b2-4f3b-8b5f-ce0a1f88fa81" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.editingGuide.execution" uuid="28182ab7-63b2-4f3b-8b5f-ce0a1f88fa81" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">67506b1e-43ad-47fe-a8e6-bc7837e9e11f(com.mbeddr.mpsutil.editingGuide)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -31,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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps
index 89c7b3c1d2b..26293db0fd2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps
@@ -130,7 +130,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -154,7 +154,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -186,6 +186,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -266,7 +267,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -305,7 +306,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
@@ -1657,7 +1657,7 @@
                               </node>
                               <node concept="2OqwBi" id="4sSf$eKhpwT" role="37vLTJ">
                                 <node concept="37vLTw" id="4sSf$eKhpnQ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4sSf$eKhphM" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2H0" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4sSf$eKhpH$" role="2OqNvi">
                                   <ref role="3TsBF5" to="k8go:4sSf$eKgZ7z" resolve="atRuntime" />
@@ -1666,9 +1666,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4sSf$eKhphM" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2H0" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4sSf$eKhphN" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2H1" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1722,14 +1722,14 @@
                         <node concept="37vLTI" id="4TMjSvbFb$2" role="3clFbG">
                           <node concept="2OqwBi" id="4TMjSvbFbQ_" role="37vLTx">
                             <node concept="37vLTw" id="4TMjSvbFbGD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4TMjSvbFaE1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2H2" resolve="it" />
                             </node>
                             <node concept="3AY5_j" id="4TMjSvbFbWA" role="2OqNvi" />
                           </node>
                           <node concept="3EllGN" id="4TMjSvbFb6U" role="37vLTJ">
                             <node concept="2OqwBi" id="4TMjSvbFboN" role="3ElVtu">
                               <node concept="37vLTw" id="4TMjSvbFbfn" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4TMjSvbFaE1" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2H2" resolve="it" />
                               </node>
                               <node concept="3AV6Ez" id="4TMjSvbFbuD" role="2OqNvi" />
                             </node>
@@ -1740,9 +1740,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4TMjSvbFaE1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2H2" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4TMjSvbFaE2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2H3" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1825,15 +1825,15 @@
                           <node concept="3clFbF" id="3GvOzXgV1bO" role="3cqZAp">
                             <node concept="2OqwBi" id="3GvOzXgV1oF" role="3clFbG">
                               <node concept="37vLTw" id="3GvOzXgV1bN" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3GvOzXgV10g" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2H4" resolve="it" />
                               </node>
                               <node concept="2z74zc" id="3GvOzXgV1yG" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3GvOzXgV10g" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2H4" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3GvOzXgV10h" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2H5" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1846,7 +1846,7 @@
                             <node concept="2OqwBi" id="3GvOzXgVT76" role="2Oq$k0">
                               <node concept="2OqwBi" id="3GvOzXgVT77" role="2Oq$k0">
                                 <node concept="37vLTw" id="3GvOzXgVT78" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3GvOzXgVbO6" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2H6" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="3GvOzXgVT79" role="2OqNvi">
                                   <ref role="37wK5l" to="mhbf:~SReference.getTargetSModelReference()" resolve="getTargetSModelReference" />
@@ -1875,9 +1875,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3GvOzXgVbO6" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2H6" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3GvOzXgVbO7" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2H7" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1889,7 +1889,7 @@
                         <node concept="2OqwBi" id="3GvOzXgWROs" role="3clFbG">
                           <node concept="2OqwBi" id="3GvOzXgWJFs" role="2Oq$k0">
                             <node concept="37vLTw" id="3GvOzXgWBTv" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3GvOzXgVdYJ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2H8" resolve="it" />
                             </node>
                             <node concept="liA8E" id="3GvOzXgWQXI" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
@@ -1899,7 +1899,7 @@
                             <ref role="37wK5l" to="mhbf:~SNode.setReferenceTarget(org.jetbrains.mps.openapi.language.SReferenceLink,org.jetbrains.mps.openapi.model.SNode)" resolve="setReferenceTarget" />
                             <node concept="2OqwBi" id="3GvOzXgWX8q" role="37wK5m">
                               <node concept="37vLTw" id="3GvOzXgWV8G" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3GvOzXgVdYJ" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2H8" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3GvOzXgWY$$" role="2OqNvi">
                                 <ref role="37wK5l" to="mhbf:~SReference.getLink()" resolve="getLink" />
@@ -1908,7 +1908,7 @@
                             <node concept="3EllGN" id="3GvOzXgX6c0" role="37wK5m">
                               <node concept="2OqwBi" id="3GvOzXgX7GB" role="3ElVtu">
                                 <node concept="37vLTw" id="3GvOzXgX7dy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3GvOzXgVdYJ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2H8" resolve="it" />
                                 </node>
                                 <node concept="2ZHEkA" id="3GvOzXgX8bu" role="2OqNvi" />
                               </node>
@@ -1920,9 +1920,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3GvOzXgVdYJ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2H8" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3GvOzXgVdYK" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2H9" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2341,16 +2341,16 @@
                             </node>
                             <node concept="2OqwBi" id="1mj5sqT5lJ3" role="3uHU7B">
                               <node concept="37vLTw" id="1mj5sqT5lJ4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1mj5sqT5lJ6" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Ha" resolve="it" />
                               </node>
                               <node concept="2bSWHS" id="1mj5sqT5lJ5" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1mj5sqT5lJ6" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ha" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1mj5sqT5lJ7" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Hb" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2365,7 +2365,7 @@
                           </node>
                           <node concept="2OqwBi" id="1mj5sqT5lJe" role="37vLTJ">
                             <node concept="37vLTw" id="1mj5sqT5lJf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1mj5sqT5lJh" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Hc" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1mj5sqT5lJg" role="2OqNvi">
                               <ref role="3TsBF5" to="k8go:3p1cdQ7_d_S" resolve="isDone" />
@@ -2374,9 +2374,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1mj5sqT5lJh" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Hc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1mj5sqT5lJi" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Hd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution/plugin.mps
index e0cce742ea8..a53711ae034 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:dba7389e-f3da-45d5-96fa-844ef50273de(com.mbeddr.mpsutil.editingGuide.execution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
   </languages>
   <imports>
@@ -34,13 +34,13 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd
index 482fcdce1c1..eb8e6c94a32 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.editingGuide.plugin" uuid="f08d1a11-2a07-4dca-9efd-7a35f6ba23ad" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.editingGuide.plugin" uuid="f08d1a11-2a07-4dca-9efd-7a35f6ba23ad" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">67506b1e-43ad-47fe-a8e6-bc7837e9e11f(com.mbeddr.mpsutil.editingGuide)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -20,10 +19,10 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps
index 45f50d4d508..f849e55b7fd 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:a93a29fb-7d82-41df-8280-3ecbf77ba55a(com.mbeddr.mpsutil.editingGuide.plugin.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -30,6 +30,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -54,7 +55,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -63,7 +64,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -112,18 +113,18 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -154,7 +155,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -166,6 +167,7 @@
   <node concept="sE7Ow" id="31xWCC5Poy">
     <property role="TrG5h" value="RunIED" />
     <property role="2uzpH1" value="Run Interactive Guide" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="31xWCC5Poz" role="tncku">
       <node concept="3clFbS" id="31xWCC5Po$" role="2VODD2">
         <node concept="3clFbF" id="2ZHlC00bPYS" role="3cqZAp">
@@ -300,6 +302,7 @@
   <node concept="sE7Ow" id="2C54m44SqnC">
     <property role="TrG5h" value="RunIEDFromHere" />
     <property role="2uzpH1" value="Run Guide from Here" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2C54m44SqnD" role="tncku">
       <node concept="3clFbS" id="2C54m44SqnE" role="2VODD2">
         <node concept="3cpWs8" id="2C54m44Ss09" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/com.mbeddr.mpsutil.editingGuide.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/com.mbeddr.mpsutil.editingGuide.runtime.msd
index 6f49e84d233..07d8cd25abe 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/com.mbeddr.mpsutil.editingGuide.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/com.mbeddr.mpsutil.editingGuide.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.editingGuide.runtime" uuid="c6e0a639-6829-4d71-a41c-9d693d7cdea5" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.editingGuide.runtime" uuid="c6e0a639-6829-4d71-a41c-9d693d7cdea5" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/models/com/mbeddr/mpsutil/editingGuide/runtime/rt.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/models/com/mbeddr/mpsutil/editingGuide/runtime/rt.mps
index 5cd3472da62..59dbd4040f3 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/models/com/mbeddr/mpsutil/editingGuide/runtime/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.runtime/models/com/mbeddr/mpsutil/editingGuide/runtime/rt.mps
@@ -30,7 +30,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -109,7 +109,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -130,7 +130,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -143,6 +143,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -179,7 +180,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -196,7 +197,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="312cEu" id="3p1cdQ7__7X">
@@ -562,7 +562,7 @@
                   <node concept="3clFbF" id="2ZHlC00azlH" role="3cqZAp">
                     <node concept="2OqwBi" id="2ZHlC00azo5" role="3clFbG">
                       <node concept="37vLTw" id="2ZHlC00azlG" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2ZHlC00azjk" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2He" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="2ZHlC00azr9" role="2OqNvi">
                         <node concept="25Kdxt" id="2ZHlC00azug" role="cj9EA">
@@ -574,9 +574,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ZHlC00azjk" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2He" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ZHlC00azjl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Hf" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd
index e4a66b30b18..6515860b6a5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.editingGuide.sandbox" uuid="5f13a59b-6e8d-425f-8111-e37060bc8864" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.editingGuide.sandbox" uuid="5f13a59b-6e8d-425f-8111-e37060bc8864" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d2a1d976-43a2-462f-ac3a-9b258ced839d(com.mbeddr.mpsutil.multilingual.baseLanguage)</dependency>
     <dependency reexport="false">c6e0a639-6829-4d71-a41c-9d693d7cdea5(com.mbeddr.mpsutil.editingGuide.runtime)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/models/com/mbeddr/mpsutil/editingGuide/sandbox/demo.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/models/com/mbeddr/mpsutil/editingGuide/sandbox/demo.mps
index d72fe907228..4232a4f8f60 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/models/com/mbeddr/mpsutil/editingGuide/sandbox/demo.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/models/com/mbeddr/mpsutil/editingGuide/sandbox/demo.mps
@@ -74,7 +74,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -87,7 +87,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -151,7 +151,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editor.utils/com.mbeddr.mpsutil.editor.utils.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editor.utils/com.mbeddr.mpsutil.editor.utils.msd
index b1016bb0ab1..8dce6a2b3a6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editor.utils/com.mbeddr.mpsutil.editor.utils.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editor.utils/com.mbeddr.mpsutil.editor.utils.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.editor.utils" uuid="371850a9-2c5b-4e1d-a811-70d97e847917" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.editor.utils" uuid="371850a9-2c5b-4e1d-a811-70d97e847917" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,14 +10,13 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <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.editor.utils/models/com/mbeddr/mpsutil/editor/utils/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editor.utils/models/com/mbeddr/mpsutil/editor/utils/runtime.mps
index b2bf24e65f6..913e96bb0db 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editor.utils/models/com/mbeddr/mpsutil/editor/utils/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editor.utils/models/com/mbeddr/mpsutil/editor/utils/runtime.mps
@@ -2,7 +2,7 @@
 <model ref="371850a9-2c5b-4e1d-a811-70d97e847917/r:f4ae6487-fb1d-418f-8dd3-759f9604156f(com.mbeddr.mpsutil.editor.utils/com.mbeddr.mpsutil.editor.utils.runtime)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -80,7 +80,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,19 +94,20 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -117,7 +118,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
@@ -298,7 +298,7 @@
                   <node concept="3clFbF" id="5T3_DgSXiyT" role="3cqZAp">
                     <node concept="2OqwBi" id="5T3_DgSXiED" role="3clFbG">
                       <node concept="37vLTw" id="5T3_DgSXiyS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5T3_DgSXiuI" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Hg" resolve="it" />
                       </node>
                       <node concept="liA8E" id="5T3_DgSXjLy" role="2OqNvi">
                         <ref role="37wK5l" to="k3nr:~MPSFileNodeEditor.getNodeEditor()" resolve="getNodeEditor" />
@@ -306,9 +306,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5T3_DgSXiuI" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Hg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5T3_DgSXiuJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Hh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -349,7 +349,7 @@
                   <node concept="3clFbF" id="5T3_DgSXkIm" role="3cqZAp">
                     <node concept="2OqwBi" id="5T3_DgSXkKZ" role="3clFbG">
                       <node concept="37vLTw" id="5T3_DgSXkIl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5T3_DgSXkFp" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Hi" resolve="it" />
                       </node>
                       <node concept="liA8E" id="5T3_DgSXkWu" role="2OqNvi">
                         <ref role="37wK5l" to="cj4x:~Editor.getCurrentEditorComponent()" resolve="getCurrentEditorComponent" />
@@ -357,9 +357,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5T3_DgSXkFp" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Hi" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5T3_DgSXkFq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Hj" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/com.mbeddr.mpsutil.extensionclass.annotation.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/com.mbeddr.mpsutil.extensionclass.annotation.msd
index b7e179baf30..8a0c31b0fb8 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/com.mbeddr.mpsutil.extensionclass.annotation.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/com.mbeddr.mpsutil.extensionclass.annotation.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.extensionclass.annotation" uuid="63c6c042-d558-4559-a9a2-93791d48eb74" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.extensionclass.annotation" uuid="63c6c042-d558-4559-a9a2-93791d48eb74" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/models/com/mbeddr/mpsutil/extensionclass/annotation/apache/commons/lang3.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/models/com/mbeddr/mpsutil/extensionclass/annotation/apache/commons/lang3.mps
index 0bcfee3900b..90f16a81e91 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/models/com/mbeddr/mpsutil/extensionclass/annotation/apache/commons/lang3.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.extensionclass.annotation/models/com/mbeddr/mpsutil/extensionclass/annotation/apache/commons/lang3.mps
@@ -9,7 +9,7 @@
   </imports>
   <registry>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/com.mbeddr.mpsutil.generatorfacade.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/com.mbeddr.mpsutil.generatorfacade.msd
index 076ccdd6382..64b7d12bc32 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/com.mbeddr.mpsutil.generatorfacade.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/com.mbeddr.mpsutil.generatorfacade.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.generatorfacade" uuid="2c9058b6-7cd8-4623-82a3-e4c07c3eddff" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.generatorfacade" uuid="2c9058b6-7cd8-4623-82a3-e4c07c3eddff" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
@@ -27,7 +26,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/models/com/mbeddr/mpsutil/generatorfacade/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/models/com/mbeddr/mpsutil/generatorfacade/runtime.mps
index 4fd8730bb13..2b83ef1923e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/models/com/mbeddr/mpsutil/generatorfacade/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.generatorfacade/models/com/mbeddr/mpsutil/generatorfacade/runtime.mps
@@ -33,7 +33,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -120,7 +120,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -143,7 +143,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -159,7 +159,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/com.mbeddr.mpsutil.genericactions.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/com.mbeddr.mpsutil.genericactions.msd
index 1599603fa69..77eb65a7636 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/com.mbeddr.mpsutil.genericactions.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/com.mbeddr.mpsutil.genericactions.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.genericactions" uuid="35bf4931-c8a2-4f76-81bc-972096f7b19a" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.genericactions" uuid="35bf4931-c8a2-4f76-81bc-972096f7b19a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,9 +21,9 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps
index cc571e3eacc..f7ab3678fd8 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps
@@ -2,11 +2,11 @@
 <model ref="r:f349b2fc-480a-4a50-8b67-cd3b0a6c33b3(com.mbeddr.mpsutil.genericactions.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
@@ -47,6 +47,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1207149998849" name="isAlwaysVisible" index="fJN8o" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1205851242421" name="methodDeclaration" index="32lrUH" />
@@ -73,7 +74,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -82,7 +83,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -189,7 +190,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -213,7 +214,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -225,6 +226,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -232,7 +234,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -256,7 +258,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -275,7 +277,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
@@ -287,6 +288,7 @@
   <node concept="sE7Ow" id="dt1EHJOpK5">
     <property role="TrG5h" value="increaseEditorFontSize" />
     <property role="2uzpH1" value="Increase MPS Editor Font Size" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="dt1EHJOpK6" role="tncku">
       <node concept="3clFbS" id="dt1EHJOpK7" role="2VODD2">
         <node concept="3clFbF" id="dt1EHJPqfn" role="3cqZAp">
@@ -649,7 +651,7 @@
                     <node concept="3clFbF" id="5T3_DgSXiyT" role="3cqZAp">
                       <node concept="2OqwBi" id="5T3_DgSXiED" role="3clFbG">
                         <node concept="37vLTw" id="5T3_DgSXiyS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5T3_DgSXiuI" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Hk" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5T3_DgSXjLy" role="2OqNvi">
                           <ref role="37wK5l" to="k3nr:~MPSFileNodeEditor.getNodeEditor()" resolve="getNodeEditor" />
@@ -657,9 +659,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5T3_DgSXiuI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Hk" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5T3_DgSXiuJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Hl" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -670,7 +672,7 @@
                   <node concept="3clFbF" id="TGQG6ki2QZ" role="3cqZAp">
                     <node concept="2OqwBi" id="5T3_DgSXkKZ" role="3clFbG">
                       <node concept="37vLTw" id="5T3_DgSXkIl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="TGQG6ki2$J" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Hm" resolve="it" />
                       </node>
                       <node concept="liA8E" id="5T3_DgSXkWu" role="2OqNvi">
                         <ref role="37wK5l" to="cj4x:~Editor.getCurrentEditorComponent()" resolve="getCurrentEditorComponent" />
@@ -678,9 +680,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="TGQG6ki2$J" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Hm" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="TGQG6ki2$K" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Hn" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -705,6 +707,7 @@
   <node concept="sE7Ow" id="dt1EHJPqgf">
     <property role="TrG5h" value="resetEditorFontSize" />
     <property role="2uzpH1" value="Reset MPS Editor Font Size" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="dt1EHJPqgg" role="tncku">
       <node concept="3clFbS" id="dt1EHJPqgh" role="2VODD2">
         <node concept="3clFbF" id="dt1EHJPqgi" role="3cqZAp">
@@ -719,6 +722,7 @@
   <node concept="sE7Ow" id="dt1EHJPqgC">
     <property role="TrG5h" value="decreaseEditorFontSize" />
     <property role="2uzpH1" value="Decrease MPS Editor Font Size" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="dt1EHJPqgD" role="tncku">
       <node concept="3clFbS" id="dt1EHJPqgE" role="2VODD2">
         <node concept="3clFbF" id="dt1EHJPqgF" role="3cqZAp">
@@ -769,6 +773,7 @@
   <node concept="sE7Ow" id="6bM7gvq4qYM">
     <property role="TrG5h" value="openGeneratorDirInFileManager" />
     <property role="2uzpH1" value="File Manager in Output Folder" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="6bM7gvq4WiB" role="32lrUH">
       <property role="TrG5h" value="getOutputPath" />
       <node concept="3clFbS" id="6bM7gvq4WiC" role="3clF47">
@@ -1069,6 +1074,7 @@
     <property role="2uzpH1" value="File Manager in Module Folder" />
     <property role="3GE5qa" value="" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="7uLL3Mf2tAq" role="tncku">
       <node concept="3clFbS" id="7uLL3Mf2tAr" role="2VODD2">
         <node concept="3cpWs8" id="7uLL3Mf2DgK" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/com.mbeddr.mpsutil.genreview.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/com.mbeddr.mpsutil.genreview.msd
index 4c7a084d607..d90b34d6a9e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/com.mbeddr.mpsutil.genreview.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/com.mbeddr.mpsutil.genreview.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.genreview" uuid="6c88fcd1-5552-4d29-9f1b-f00bd84dd40e" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.genreview" uuid="6c88fcd1-5552-4d29-9f1b-f00bd84dd40e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -25,14 +24,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.highlighting.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.highlighting.mps
index 05bf2e27c40..c652c5c8af7 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.highlighting.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.highlighting.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
   </languages>
@@ -36,7 +36,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -111,7 +111,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,7 +126,7 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -145,13 +145,14 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -166,7 +167,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -441,15 +441,15 @@
                         <node concept="liA8E" id="7XJGPBq1ATV" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                           <node concept="37vLTw" id="7XJGPBq1ATW" role="37wK5m">
-                            <ref role="3cqZAo" node="7XJGPBq1ATX" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ho" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7XJGPBq1ATX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Ho" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7XJGPBq1ATY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Hp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps
index 8a559755ed1..44356517d7d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -11,7 +11,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports>
@@ -83,6 +83,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1207149998849" name="isAlwaysVisible" index="fJN8o" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <property id="1213273179528" name="description" index="1WHSii" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
@@ -129,7 +130,7 @@
       <concept id="471625927503601927" name="jetbrains.mps.lang.plugin.structure.NumberToolShortcut" flags="ng" index="15feLf">
         <property id="471625927503601955" name="number" index="15feLF" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -141,7 +142,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -181,7 +182,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -310,7 +311,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -342,7 +343,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -405,7 +406,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -426,7 +427,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -480,6 +481,7 @@
     <property role="2uzpH1" value="Set Path to the Generated Artifacts to Be Reviewed" />
     <property role="fJN8o" value="true" />
     <property role="1WHSii" value="The location to the generated artifacts is set as the generation output for this model" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="DMIuLumKyB" role="32lrUH">
       <property role="TrG5h" value="getOutputPath" />
       <node concept="3clFbS" id="DMIuLumKyC" role="3clF47">
@@ -6960,6 +6962,7 @@
     <property role="2uzpH1" value="Open Generated Artifacts Review Tool" />
     <property role="1WHSii" value="Opens a tool for reviewing the generated artifacts" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="5BkFC2yhAHn" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -7035,6 +7038,7 @@
     <property role="TrG5h" value="HighlightCodeForNodeAction" />
     <property role="2uzpH1" value="Highlight Generated Lines" />
     <property role="1WHSii" value="Highlights the generated lines corresponding to the current node" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="37J4MLLDMlp" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.utils.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.utils.mps
index 27926dd629a..a1a1f777245 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.utils.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.utils.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -153,7 +153,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -180,7 +180,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -237,7 +237,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd
index 28f685f10b1..fbd9dd31900 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.httpserver" uuid="c2788093-51e8-4cfe-943b-eefd5ff309ff" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.httpserver" uuid="c2788093-51e8-4cfe-943b-eefd5ff309ff" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">7f0984ac-9f5d-4001-9257-17f7d10f3fd5(com.mbeddr.mpsutil.httpsupport.rt)</dependency>
@@ -20,14 +19,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps
index 22c947479fb..fe70953eec9 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -187,7 +187,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -216,7 +216,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -255,6 +255,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -277,7 +278,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -312,7 +313,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="5232196642625575054" name="jetbrains.mps.baseLanguage.collections.structure.TailListOperation" flags="nn" index="1eb2uI">
@@ -1128,7 +1128,7 @@
                       <node concept="17QB3L" id="9Us$1s4XeY" role="1tU5fm" />
                       <node concept="2OqwBi" id="9Us$1s4Xf7" role="33vP2m">
                         <node concept="37vLTw" id="9Us$1s4Xf8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="9Us$1rWK2w" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Hq" resolve="it" />
                         </node>
                         <node concept="liA8E" id="9Us$1s4Xf9" role="2OqNvi">
                           <ref role="37wK5l" to="znf8:9Us$1rWBb$" resolve="getPathSpec" />
@@ -1148,7 +1148,7 @@
                             <ref role="37wK5l" to="ky10:~ServletHolder.&lt;init&gt;(javax.servlet.Servlet)" resolve="ServletHolder" />
                             <node concept="2OqwBi" id="9Us$1rWK2q" role="37wK5m">
                               <node concept="37vLTw" id="9Us$1rWK2r" role="2Oq$k0">
-                                <ref role="3cqZAo" node="9Us$1rWK2w" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Hq" resolve="it" />
                               </node>
                               <node concept="liA8E" id="9Us$1rWK2s" role="2OqNvi">
                                 <ref role="37wK5l" to="znf8:9Us$1rWBac" resolve="getServlet" />
@@ -1163,9 +1163,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="9Us$1rWK2w" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Hq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="9Us$1rWK2x" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Hr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1743,14 +1743,14 @@
                                           <ref role="3uigEE" to="m2xw:~NetworkConnector" resolve="NetworkConnector" />
                                         </node>
                                         <node concept="37vLTw" id="9Us$1rVY$m" role="2ZW6bz">
-                                          <ref role="3cqZAo" node="9Us$1rVY$n" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2Hs" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="9Us$1rVY$n" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2SR9xrsN2Hs" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="9Us$1rVY$o" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2SR9xrsN2Ht" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1965,15 +1965,15 @@
                         <node concept="3clFbF" id="2N1CSrzOLiE" role="3cqZAp">
                           <node concept="2OqwBi" id="2N1CSrzOLiF" role="3clFbG">
                             <node concept="37vLTw" id="2N1CSrzOLiG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2N1CSrzOLiI" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Hu" resolve="it" />
                             </node>
                             <node concept="17RvpY" id="2N1CSrzOLiH" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2N1CSrzOLiI" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Hu" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2N1CSrzOLiJ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Hv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/com.mbeddr.mpsutil.httpsupport.rt.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/com.mbeddr.mpsutil.httpsupport.rt.msd
index 30174217774..c682da80fc9 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/com.mbeddr.mpsutil.httpsupport.rt.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/com.mbeddr.mpsutil.httpsupport.rt.msd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.httpsupport.rt" uuid="7f0984ac-9f5d-4001-9257-17f7d10f3fd5" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.httpsupport.rt" uuid="7f0984ac-9f5d-4001-9257-17f7d10f3fd5" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}">
       <sourceRoot location="lib/javax.servlet-api-3.1.0.jar" />
       <sourceRoot location="lib/jetty-all-9.4.8.v20171121-uber.jar" />
     </modelRoot>
@@ -12,13 +12,10 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/javax.servlet-api-3.1.0.jar" />
+      <library location="${module}/lib/jetty-all-9.4.8.v20171121-uber.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/javax.servlet-api-3.1.0.jar" />
-    <stubModelEntry path="${module}/lib/jetty-all-9.4.8.v20171121-uber.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
@@ -31,14 +28,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/model.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/model.mps
index 85c12475e9d..369f85d9519 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/model.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/model.mps
@@ -38,7 +38,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -142,7 +142,7 @@
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -166,7 +166,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -183,13 +183,14 @@
       <concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -222,7 +223,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -724,15 +724,15 @@
                       <node concept="3clFbF" id="1NEr3BKtx2C" role="3cqZAp">
                         <node concept="2OqwBi" id="1NEr3BKtxiv" role="3clFbG">
                           <node concept="37vLTw" id="1NEr3BKtx2B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1NEr3BKtwEp" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Hw" resolve="it" />
                           </node>
                           <node concept="17RvpY" id="1NEr3BKtyal" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1NEr3BKtwEp" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Hw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1NEr3BKtwEq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Hx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1370,7 +1370,7 @@
                                       <ref role="3cqZAo" node="2VC4eVY21Cf" resolve="s" />
                                     </node>
                                     <node concept="37vLTw" id="2VC4eVY21Ce" role="3uHU7w">
-                                      <ref role="3cqZAo" node="2VC4eVY21Ch" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Hy" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -1380,9 +1380,9 @@
                               <property role="TrG5h" value="s" />
                               <node concept="17QB3L" id="2VC4eVY21Cg" role="1tU5fm" />
                             </node>
-                            <node concept="Rh6nW" id="2VC4eVY21Ch" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2Hy" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2VC4eVY21Ci" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2Hz" role="1tU5fm" />
                             </node>
                           </node>
                           <node concept="Xl_RD" id="2VC4eVY21Cj" role="1MDeny">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/plugin.mps
index a56c20e05ab..eb4dff3a5e6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpsupport.rt/models/com/mbeddr/mpsutil/httpsupport/rt/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="1e7c1f95-336c-4cec-b00e-8cc6e0c2b265" name="com.mbeddr.mpsutil.preferenceform" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="23f985f2-965f-4af1-aee8-a32677429514" name="com.mbeddr.mpsutil.multilingual.common" version="-1" />
     <use id="d2a1d976-43a2-462f-ac3a-9b258ced839d" name="com.mbeddr.mpsutil.multilingual.baseLanguage" version="-1" />
@@ -95,7 +95,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -106,7 +106,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -124,6 +124,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -134,12 +135,12 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -151,7 +152,7 @@
       <concept id="568377005202317270" name="com.mbeddr.mpsutil.multilingual.common.structure.MessageKey" flags="ng" index="3MtHw9">
         <property id="568377005202317271" name="technicalKey" index="3MtHw8" />
       </concept>
-      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
+      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
         <reference id="2510545900188083932" name="key" index="3ZOmrH" />
       </concept>
     </language>
@@ -160,7 +161,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
     <language id="1e7c1f95-336c-4cec-b00e-8cc6e0c2b265" name="com.mbeddr.mpsutil.preferenceform">
       <concept id="4728279602824475247" name="com.mbeddr.mpsutil.preferenceform.structure.IntegerFieldPreferenceFormProperty" flags="ng" index="czsHg">
@@ -438,7 +438,7 @@
                   <node concept="3clFbF" id="3vXSZsAPS8d" role="3cqZAp">
                     <node concept="2OqwBi" id="3vXSZsAPScp" role="3clFbG">
                       <node concept="37vLTw" id="3vXSZsAPS8c" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3vXSZsAPS2B" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2H$" resolve="it" />
                       </node>
                       <node concept="liA8E" id="3vXSZsAPTd7" role="2OqNvi">
                         <ref role="37wK5l" node="3vXSZsAPOHl" resolve="serverChanged" />
@@ -449,9 +449,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3vXSZsAPS2B" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2H$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3vXSZsAPS2C" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2H_" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox.msd
index eee348b821e..e7a51dffa95 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.hyperlink.sandbox.sandbox" uuid="283d2615-5bd1-4ed0-8f73-a64441568755" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.hyperlink.sandbox.sandbox" uuid="283d2615-5bd1-4ed0-8f73-a64441568755" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:2d90dfd2-4b63-4216-b74d-8e16508c4961:com.mbeddr.mpsutil.hyperlink.sandbox" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/com.mbeddr.mpsutil.interpreter.migration.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/com.mbeddr.mpsutil.interpreter.migration.msd
index 8034122230d..a0947c1f05f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/com.mbeddr.mpsutil.interpreter.migration.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/com.mbeddr.mpsutil.interpreter.migration.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.interpreter.migration" uuid="f481e2c1-2d79-4934-9442-e8f531767a84" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.interpreter.migration" uuid="f481e2c1-2d79-4934-9442-e8f531767a84" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">798100da-4f0a-421a-b991-71f8c50ce5d2(jetbrains.mps.build)</dependency>
@@ -22,12 +21,13 @@
     <dependency reexport="false">0cf935df-4699-4e9c-a132-fa109541cba3(jetbrains.mps.build.mps)</dependency>
     <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
     <dependency reexport="false">47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)</dependency>
+    <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -35,10 +35,12 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
     <language slang="l: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>
@@ -56,6 +58,8 @@
     <module reference="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" version="0" />
     <module reference="726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="798100da-4f0a-421a-b991-71f8c50ce5d2(jetbrains.mps.build)" version="0" />
     <module reference="0cf935df-4699-4e9c-a132-fa109541cba3(jetbrains.mps.build.mps)" version="0" />
@@ -63,6 +67,7 @@
     <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps
index ebb7c83c085..d70a717970c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps
@@ -2,12 +2,13 @@
 <model ref="r:2a7f6196-180a-4418-9a5f-ee19d9eab17f(com.mbeddr.mpsutil.interpreter.migration.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
+    <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -41,6 +42,7 @@
     <import index="kdzh" ref="r:0353b795-df17-4050-9687-ee47eeb7094f(jetbrains.mps.build.mps.structure)" />
     <import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="bgxn" ref="r:01d327ba-040c-402c-a2b6-8832116588df(jetbrains.mps.lang.plugin.plugin)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -62,6 +64,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1207149998849" name="isAlwaysVisible" index="fJN8o" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -84,7 +87,7 @@
       <concept id="1204383956737" name="jetbrains.mps.lang.plugin.structure.InterfaceGroup" flags="ng" index="1ESbSp">
         <child id="1206193920040" name="groupID" index="3mKD$K" />
       </concept>
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -106,7 +109,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -153,7 +156,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -212,7 +215,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -233,7 +236,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -247,6 +250,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
@@ -258,18 +264,25 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage">
+      <concept id="6171083915388330090" name="jetbrains.mps.lang.slanguage.structure.AspectModelRefExpression" flags="ng" index="1qvjxa">
+        <reference id="6171083915388597767" name="aspect" index="1quiSB" />
+        <child id="6171083915388330091" name="lang" index="1qvjxb" />
+      </concept>
+    </language>
     <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
       <concept id="1216860049633" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextType" flags="in" index="1iwH7U" />
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -349,7 +362,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -391,7 +404,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -424,6 +436,7 @@
       </concept>
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
+      <concept id="31378964227347002" name="jetbrains.mps.baseLanguage.collections.structure.SelectNotNullOperation" flags="ng" index="1KnU$U" />
     </language>
   </registry>
   <node concept="2DaZZR" id="5zViqzlhitH" />
@@ -438,6 +451,7 @@
     <property role="TrG5h" value="MigrateInterpreter" />
     <property role="2uzpH1" value="Interpreter: Move to pluginSolution" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="5zViqzlgrp5" role="tncku">
       <node concept="3clFbS" id="5zViqzlgrp6" role="2VODD2">
         <node concept="3clFbF" id="5zViqzlgt4z" role="3cqZAp">
@@ -595,10 +609,10 @@
                               <node concept="3clFbS" id="3oa_eBEKVKt" role="1bW5cS">
                                 <node concept="3cpWs8" id="5zViqzlfXFe" role="3cqZAp">
                                   <node concept="3cpWsn" id="5zViqzlfXFf" role="3cpWs9">
-                                    <property role="TrG5h" value="modules" />
+                                    <property role="TrG5h" value="module" />
                                     <node concept="A3Dl8" id="5zViqzlfY3e" role="1tU5fm">
                                       <node concept="3uibUv" id="3oa_eBEH8QB" role="A3Ik2">
-                                        <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                                        <ref role="3uigEE" to="w1kc:~Language" resolve="Language" />
                                       </node>
                                     </node>
                                     <node concept="2OqwBi" id="5zViqzlfXFg" role="33vP2m">
@@ -606,7 +620,10 @@
                                         <ref role="3cqZAo" node="4rzYyIJ6hm_" resolve="mpsProject" />
                                       </node>
                                       <node concept="liA8E" id="5zViqzlfXFi" role="2OqNvi">
-                                        <ref role="37wK5l" to="z1c4:~IProject.getProjectModules()" resolve="getProjectModules" />
+                                        <ref role="37wK5l" to="z1c4:~Project.getProjectModules(java.lang.Class)" resolve="getProjectModules" />
+                                        <node concept="3VsKOn" id="2x4nHT4vOQf" role="37wK5m">
+                                          <ref role="3VsUkX" to="w1kc:~Language" resolve="Language" />
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
@@ -621,59 +638,29 @@
                                     </node>
                                     <node concept="2OqwBi" id="3oa_eBEHUET" role="33vP2m">
                                       <node concept="2OqwBi" id="3oa_eBEHm8r" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="3oa_eBEHm8s" role="2Oq$k0">
-                                          <node concept="37vLTw" id="3oa_eBEHm8t" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5zViqzlfXFf" resolve="modules" />
-                                          </node>
-                                          <node concept="UnYns" id="3oa_eBEHm8u" role="2OqNvi">
-                                            <node concept="3uibUv" id="3oa_eBEHm8v" role="UnYnz">
-                                              <ref role="3uigEE" to="w1kc:~Language" resolve="Language" />
-                                            </node>
-                                          </node>
+                                        <node concept="37vLTw" id="3oa_eBEHm8t" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="5zViqzlfXFf" resolve="module" />
                                         </node>
                                         <node concept="3$u5V9" id="3oa_eBEHm8w" role="2OqNvi">
                                           <node concept="1bVj0M" id="3oa_eBEHm8x" role="23t8la">
                                             <node concept="3clFbS" id="3oa_eBEHm8y" role="1bW5cS">
                                               <node concept="3clFbF" id="3oa_eBEHm8z" role="3cqZAp">
-                                                <node concept="2OqwBi" id="3oa_eBEHm8$" role="3clFbG">
-                                                  <node concept="Rm8GO" id="3oa_eBEHm8_" role="2Oq$k0">
-                                                    <ref role="Rm8GQ" to="w1kc:~LanguageAspect.PLUGIN" resolve="PLUGIN" />
-                                                    <ref role="1Px2BO" to="w1kc:~LanguageAspect" resolve="LanguageAspect" />
-                                                  </node>
-                                                  <node concept="liA8E" id="3oa_eBEHm8A" role="2OqNvi">
-                                                    <ref role="37wK5l" to="w1kc:~LanguageAspect.get(jetbrains.mps.smodel.Language)" resolve="get" />
-                                                    <node concept="37vLTw" id="3oa_eBEHm8B" role="37wK5m">
-                                                      <ref role="3cqZAo" node="3oa_eBEHm8C" resolve="it" />
-                                                    </node>
+                                                <node concept="1qvjxa" id="2x4nHT4uAP3" role="3clFbG">
+                                                  <ref role="1quiSB" to="bgxn:2LiUEk8oQ$g" resolve="plugin" />
+                                                  <node concept="37vLTw" id="2x4nHT4uHqU" role="1qvjxb">
+                                                    <ref role="3cqZAo" node="2SR9xrsN2HA" resolve="it" />
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="3oa_eBEHm8C" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN2HA" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="3oa_eBEHm8D" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN2HB" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3zZkjj" id="3oa_eBEHVJq" role="2OqNvi">
-                                        <node concept="1bVj0M" id="3oa_eBEHVJs" role="23t8la">
-                                          <node concept="3clFbS" id="3oa_eBEHVJt" role="1bW5cS">
-                                            <node concept="3clFbF" id="3oa_eBEHW8r" role="3cqZAp">
-                                              <node concept="3y3z36" id="3oa_eBEHWsT" role="3clFbG">
-                                                <node concept="10Nm6u" id="3oa_eBEHWyV" role="3uHU7w" />
-                                                <node concept="37vLTw" id="3oa_eBEHW8q" role="3uHU7B">
-                                                  <ref role="3cqZAo" node="3oa_eBEHVJu" resolve="it" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="Rh6nW" id="3oa_eBEHVJu" role="1bW2Oz">
-                                            <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="3oa_eBEHVJv" role="1tU5fm" />
-                                          </node>
-                                        </node>
-                                      </node>
+                                      <node concept="1KnU$U" id="2x4nHT4vczF" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
@@ -695,7 +682,7 @@
                                             <node concept="3clFbF" id="5zViqzlg29Q" role="3cqZAp">
                                               <node concept="2OqwBi" id="5zViqzlg29R" role="3clFbG">
                                                 <node concept="37vLTw" id="5zViqzlg29S" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="5zViqzlg29U" resolve="it" />
+                                                  <ref role="3cqZAo" node="2SR9xrsN2HC" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="5zViqzlg29T" role="2OqNvi">
                                                   <ref role="37wK5l" to="mhbf:~SModel.getRootNodes()" resolve="getRootNodes" />
@@ -703,9 +690,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="5zViqzlg29U" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN2HC" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="5zViqzlg29V" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN2HD" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -739,7 +726,7 @@
                                                   <node concept="2OqwBi" id="5zViqzlgc6Q" role="3uHU7B">
                                                     <node concept="2OqwBi" id="5zViqzlgc6R" role="2Oq$k0">
                                                       <node concept="37vLTw" id="5zViqzlgc6S" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="5zViqzlgc6V" resolve="it" />
+                                                        <ref role="3cqZAo" node="2SR9xrsN2HE" resolve="it" />
                                                       </node>
                                                       <node concept="liA8E" id="5zViqzlgc6T" role="2OqNvi">
                                                         <ref role="37wK5l" to="mhbf:~SNode.getConcept()" resolve="getConcept" />
@@ -752,9 +739,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="5zViqzlgc6V" role="1bW2Oz">
+                                            <node concept="gl6BB" id="2SR9xrsN2HE" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="5zViqzlgc6W" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="2SR9xrsN2HF" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -898,7 +885,7 @@
                                                                 <node concept="3clFbF" id="3oa_eBESEUP" role="3cqZAp">
                                                                   <node concept="2OqwBi" id="3oa_eBESF$O" role="3clFbG">
                                                                     <node concept="37vLTw" id="3oa_eBESEUO" role="2Oq$k0">
-                                                                      <ref role="3cqZAo" node="3oa_eBESDxs" resolve="it" />
+                                                                      <ref role="3cqZAo" node="2SR9xrsN2HG" resolve="it" />
                                                                     </node>
                                                                     <node concept="liA8E" id="3oa_eBESGUo" role="2OqNvi">
                                                                       <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -906,9 +893,9 @@
                                                                   </node>
                                                                 </node>
                                                               </node>
-                                                              <node concept="Rh6nW" id="3oa_eBESDxs" role="1bW2Oz">
+                                                              <node concept="gl6BB" id="2SR9xrsN2HG" role="1bW2Oz">
                                                                 <property role="TrG5h" value="it" />
-                                                                <node concept="2jxLKc" id="3oa_eBESDxt" role="1tU5fm" />
+                                                                <node concept="2jxLKc" id="2SR9xrsN2HH" role="1tU5fm" />
                                                               </node>
                                                             </node>
                                                           </node>
@@ -918,13 +905,13 @@
                                                             <node concept="3clFbS" id="3oa_eBEU58b" role="1bW5cS">
                                                               <node concept="3clFbF" id="3oa_eBEU6Xk" role="3cqZAp">
                                                                 <node concept="37vLTw" id="3oa_eBEU6Xj" role="3clFbG">
-                                                                  <ref role="3cqZAo" node="3oa_eBEU58c" resolve="it" />
+                                                                  <ref role="3cqZAo" node="2SR9xrsN2HI" resolve="it" />
                                                                 </node>
                                                               </node>
                                                             </node>
-                                                            <node concept="Rh6nW" id="3oa_eBEU58c" role="1bW2Oz">
+                                                            <node concept="gl6BB" id="2SR9xrsN2HI" role="1bW2Oz">
                                                               <property role="TrG5h" value="it" />
-                                                              <node concept="2jxLKc" id="3oa_eBEU58d" role="1tU5fm" />
+                                                              <node concept="2jxLKc" id="2SR9xrsN2HJ" role="1tU5fm" />
                                                             </node>
                                                           </node>
                                                           <node concept="1nlBCl" id="3oa_eBEU58e" role="2S7zOq">
@@ -1056,11 +1043,11 @@
                       <node concept="3clFbF" id="3oa_eBEDRwL" role="3cqZAp">
                         <node concept="1Ls8ON" id="3oa_eBEDRwM" role="3clFbG">
                           <node concept="37vLTw" id="3oa_eBEDRwN" role="1Lso8e">
-                            <ref role="3cqZAo" node="3oa_eBEDRwR" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2HK" resolve="it" />
                           </node>
                           <node concept="2OqwBi" id="3oa_eBEDRwO" role="1Lso8e">
                             <node concept="37vLTw" id="3oa_eBEDRwP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3oa_eBEDRwR" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2HK" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3oa_eBEDRwQ" role="2OqNvi">
                               <ref role="3Tt5mk" to="3673:5LSSDsNpMLx" resolve="target" />
@@ -1069,9 +1056,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3oa_eBEDRwR" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2HK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3oa_eBEDRwS" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2HL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1592,7 +1579,7 @@
                             <node concept="2OqwBi" id="3oa_eBEOyW0" role="3clFbG">
                               <node concept="2OqwBi" id="3oa_eBEOyW1" role="2Oq$k0">
                                 <node concept="37vLTw" id="3oa_eBEOyW2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3oa_eBEOyW6" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2HM" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="3oa_eBEOyW3" role="2OqNvi">
                                   <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -1607,9 +1594,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3oa_eBEOyW6" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2HM" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3oa_eBEOyW7" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2HN" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1620,7 +1607,7 @@
                         <node concept="3clFbF" id="3oa_eBEOyWb" role="3cqZAp">
                           <node concept="2OqwBi" id="3oa_eBEOyWc" role="3clFbG">
                             <node concept="37vLTw" id="3oa_eBEOyWd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3oa_eBEOyWf" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2HO" resolve="it" />
                             </node>
                             <node concept="liA8E" id="3oa_eBEOyWe" role="2OqNvi">
                               <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
@@ -1628,9 +1615,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3oa_eBEOyWf" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2HO" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3oa_eBEOyWg" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2HP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1641,7 +1628,7 @@
                       <node concept="3clFbF" id="3oa_eBEOyWk" role="3cqZAp">
                         <node concept="2OqwBi" id="3oa_eBEOyWl" role="3clFbG">
                           <node concept="37vLTw" id="3oa_eBEOyWm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3oa_eBEOyWo" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2HQ" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3oa_eBEOyWn" role="2OqNvi">
                             <ref role="37wK5l" to="mhbf:~SModel.getRootNodes()" resolve="getRootNodes" />
@@ -1649,9 +1636,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3oa_eBEOyWo" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2HQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3oa_eBEOyWp" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2HR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1668,12 +1655,12 @@
                   <node concept="3clFbF" id="3oa_eBEOId0" role="3cqZAp">
                     <node concept="37vLTI" id="3oa_eBEP409" role="3clFbG">
                       <node concept="37vLTw" id="3oa_eBEP4nU" role="37vLTx">
-                        <ref role="3cqZAo" node="3oa_eBEODqO" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2HS" resolve="it" />
                       </node>
                       <node concept="3EllGN" id="3oa_eBEOJg4" role="37vLTJ">
                         <node concept="2OqwBi" id="3oa_eBEOKxx" role="3ElVtu">
                           <node concept="37vLTw" id="3oa_eBEOK0a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3oa_eBEODqO" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2HS" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3oa_eBEP3eT" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1686,9 +1673,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3oa_eBEODqO" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2HS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3oa_eBEODqP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2HT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1886,7 +1873,7 @@
                               <node concept="3clFbF" id="4rzYyIJggTj" role="3cqZAp">
                                 <node concept="2OqwBi" id="4rzYyIJggTk" role="3clFbG">
                                   <node concept="37vLTw" id="4rzYyIJggTl" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4rzYyIJggTn" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2HU" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="4rzYyIJggTm" role="2OqNvi">
                                     <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -1894,9 +1881,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4rzYyIJggTn" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2HU" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4rzYyIJggTo" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2HV" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1906,13 +1893,13 @@
                           <node concept="3clFbS" id="3oa_eBELcB6" role="1bW5cS">
                             <node concept="3clFbF" id="3oa_eBELd25" role="3cqZAp">
                               <node concept="37vLTw" id="3oa_eBELd24" role="3clFbG">
-                                <ref role="3cqZAo" node="3oa_eBELcB7" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2HW" resolve="it" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3oa_eBELcB7" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2HW" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3oa_eBELcB8" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2HX" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="1nlBCl" id="3oa_eBELcB9" role="2S7zOq">
@@ -2248,7 +2235,7 @@
                         </node>
                         <node concept="2OqwBi" id="Uu7NyQzp0S" role="3uHU7B">
                           <node concept="37vLTw" id="Uu7NyQzp0T" role="2Oq$k0">
-                            <ref role="3cqZAo" node="Uu7NyQzp0V" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2HY" resolve="it" />
                           </node>
                           <node concept="liA8E" id="Uu7NyQzp0U" role="2OqNvi">
                             <ref role="37wK5l" to="z1c4:~AbstractModule.getModuleName()" resolve="getModuleName" />
@@ -2257,9 +2244,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Uu7NyQzp0V" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2HY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Uu7NyQzp0W" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2HZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2610,10 +2597,10 @@
             <node concept="3clFbF" id="YmESZLf8Z" role="3cqZAp">
               <node concept="2OqwBi" id="YmESZLfdD" role="3clFbG">
                 <node concept="37vLTw" id="2amrMVodfHA" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5zViqzlauBe" resolve="project" />
+                  <ref role="3cqZAo" node="2XLNzKQyxel" resolve="mpsProject" />
                 </node>
                 <node concept="liA8E" id="YmESZLfvA" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c4:~IProject.addModule(org.jetbrains.mps.openapi.module.SModule)" resolve="addModule" />
+                  <ref role="37wK5l" to="z1c4:~ProjectBase.addModule(org.jetbrains.mps.openapi.module.SModule)" resolve="addModule" />
                   <node concept="37vLTw" id="5zViqzlj9hR" role="37wK5m">
                     <ref role="3cqZAo" node="Uu7NyQyMnn" resolve="module" />
                   </node>
@@ -2767,7 +2754,7 @@
                         <node concept="2OqwBi" id="Uu7NyQzLfA" role="3uHU7B">
                           <node concept="2OqwBi" id="Uu7NyQzLfB" role="2Oq$k0">
                             <node concept="37vLTw" id="Uu7NyQzLfC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="Uu7NyQzLfF" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2I0" resolve="it" />
                             </node>
                             <node concept="liA8E" id="Uu7NyQzLfD" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
@@ -2780,9 +2767,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Uu7NyQzLfF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2I0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Uu7NyQzLfG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2I1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2825,7 +2812,7 @@
                         <node concept="3clFbF" id="1sLDAUZpEsi" role="3cqZAp">
                           <node concept="2OqwBi" id="1sLDAUZpEsj" role="3clFbG">
                             <node concept="37vLTw" id="1sLDAUZpEsk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1sLDAUZpEsm" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2I2" resolve="it" />
                             </node>
                             <node concept="liA8E" id="1sLDAUZpEsl" role="2OqNvi">
                               <ref role="37wK5l" to="dush:~ModelRoot.canCreateModels()" resolve="canCreateModels" />
@@ -2833,9 +2820,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1sLDAUZpEsm" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2I2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1sLDAUZpEsn" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2I3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2994,7 +2981,7 @@
                                     <node concept="3fqX7Q" id="4rzYyIJnkCF" role="3clFbG">
                                       <node concept="2OqwBi" id="4rzYyIJnkCH" role="3fr31v">
                                         <node concept="37vLTw" id="4rzYyIJnkCI" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4rzYyIJnhDl" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2I4" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="4rzYyIJnkCJ" role="2OqNvi">
                                           <ref role="37wK5l" to="lui2:~SModule.isReadOnly()" resolve="isReadOnly" />
@@ -3003,9 +2990,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4rzYyIJnhDl" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2I4" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4rzYyIJnhDm" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2I5" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3022,7 +3009,7 @@
                               <node concept="3clFbF" id="4rzYyIJ6SCi" role="3cqZAp">
                                 <node concept="2OqwBi" id="4rzYyIJ6TgQ" role="3clFbG">
                                   <node concept="37vLTw" id="4rzYyIJ6SCh" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4rzYyIJ6Sog" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2I6" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="4rzYyIJ6Ump" role="2OqNvi">
                                     <ref role="37wK5l" to="31cb:~SModuleBase.getModels()" resolve="getModels" />
@@ -3030,9 +3017,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4rzYyIJ6Sog" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2I6" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4rzYyIJ6Soh" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2I7" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3043,7 +3030,7 @@
                             <node concept="3clFbF" id="4rzYyIJ6XuI" role="3cqZAp">
                               <node concept="2OqwBi" id="4rzYyIJ6XMB" role="3clFbG">
                                 <node concept="37vLTw" id="4rzYyIJ6XuH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4rzYyIJ6Xe$" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2I8" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="4rzYyIJ6YEB" role="2OqNvi">
                                   <ref role="37wK5l" to="mhbf:~SModel.getRootNodes()" resolve="getRootNodes" />
@@ -3051,9 +3038,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4rzYyIJ6Xe$" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2I8" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4rzYyIJ6Xe_" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2I9" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3115,7 +3102,7 @@
                       <node concept="3clFbF" id="4rzYyIJfy48" role="3cqZAp">
                         <node concept="2OqwBi" id="4rzYyIJfy49" role="3clFbG">
                           <node concept="37vLTw" id="4rzYyIJfy4a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4rzYyIJfy4e" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ia" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="4rzYyIJfy4b" role="2OqNvi">
                             <node concept="1xMEDy" id="4rzYyIJfy4c" role="1xVPHs">
@@ -3127,9 +3114,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4rzYyIJfy4e" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Ia" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4rzYyIJfy4f" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Ib" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3154,7 +3141,7 @@
                         </node>
                         <node concept="2OqwBi" id="4rzYyIJfy4q" role="3uHU7B">
                           <node concept="37vLTw" id="4rzYyIJfy4r" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4rzYyIJfy4t" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ic" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4rzYyIJfy4s" role="2OqNvi">
                             <ref role="3TsBF5" to="kdzh:hS0KzPOSqb" resolve="uuid" />
@@ -3163,9 +3150,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4rzYyIJfy4t" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Ic" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4rzYyIJfy4u" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Id" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/com.mbeddr.mpsutil.interpreter.plugin.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/com.mbeddr.mpsutil.interpreter.plugin.msd
index 4319906a4a8..66f76dae8c4 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/com.mbeddr.mpsutil.interpreter.plugin.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/com.mbeddr.mpsutil.interpreter.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.interpreter.plugin" uuid="1152e500-242c-4261-8518-2806cb83e0c9" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.interpreter.plugin" uuid="1152e500-242c-4261-8518-2806cb83e0c9" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
@@ -22,7 +21,7 @@
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps
index e4dc71c97b1..b9959bc305a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:3b87c7c0-982f-4d66-aeaf-2a82d4bcd97a(com.mbeddr.mpsutil.interpreter.plugin.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
   </languages>
   <imports>
@@ -50,7 +50,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -110,7 +110,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,7 +123,7 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -139,12 +139,12 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd
index 271e6d9fb3f..c3aad4eff87 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.javainterpreter.richstring" uuid="71d44b97-2997-4a8d-8431-0df3fabaa31b" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.javainterpreter.richstring" uuid="71d44b97-2997-4a8d-8431-0df3fabaa31b" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
     <dependency reexport="false">b1884779-4586-489d-a56d-57e19a9137d4(com.mbeddr.mpsutil.javainterpreter)</dependency>
@@ -19,7 +18,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" 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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps
index 14140cb6898..a12251bdfee 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps
@@ -107,7 +107,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,7 +131,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -168,7 +168,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/com.mbeddr.mpsutil.javainterpreter.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/com.mbeddr.mpsutil.javainterpreter.msd
index 7d62153179e..04f007258d3 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/com.mbeddr.mpsutil.javainterpreter.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/com.mbeddr.mpsutil.javainterpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.javainterpreter" uuid="b1884779-4586-489d-a56d-57e19a9137d4" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.javainterpreter" uuid="b1884779-4586-489d-a56d-57e19a9137d4" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
@@ -22,11 +21,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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/models/com/mbeddr/mpsutil/javainterpreter/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/models/com/mbeddr/mpsutil/javainterpreter/plugin.mps
index dd5e8e4360f..446a1d36e88 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/models/com/mbeddr/mpsutil/javainterpreter/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter/models/com/mbeddr/mpsutil/javainterpreter/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -150,7 +150,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -170,7 +170,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1225892208569" name="jetbrains.mps.baseLanguage.structure.ShiftLeftExpression" flags="nn" index="1GRDU$" />
@@ -291,7 +291,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/com.mbeddr.mpsutil.jfreechart.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/com.mbeddr.mpsutil.jfreechart.runtime.msd
index b96d23977f1..bad5d4268d1 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/com.mbeddr.mpsutil.jfreechart.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/com.mbeddr.mpsutil.jfreechart.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.jfreechart.runtime" uuid="7fe13e34-8620-4d5d-92c7-df091b0ed628" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.jfreechart.runtime" uuid="7fe13e34-8620-4d5d-92c7-df091b0ed628" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -12,13 +12,10 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/jfreechart-1.0.19.jar" />
+      <library location="${module}/lib/jcommon-1.0.23.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/jfreechart-1.0.19.jar" />
-    <stubModelEntry path="${module}/lib/jcommon-1.0.23.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -28,13 +25,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime.mps
index 63be256bdc0..bcf6552d0b9 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime.mps
@@ -2,7 +2,7 @@
 <model ref="r:fadeecbe-c562-45e8-8455-9a1dcf642f16(com.mbeddr.mpsutil.jfreechart.runtime)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps
index 596d3b0599d..6161538454c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:8d0c5c47-17fd-4c51-b185-4bf2a45d5270(com.mbeddr.mpsutil.jfreechart.runtime.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -60,7 +60,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -124,7 +124,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -140,7 +140,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -150,7 +150,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -159,7 +159,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/com.mbeddr.mpsutil.jfreechart.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/com.mbeddr.mpsutil.jfreechart.sandbox.msd
index 7d7ee5be7a6..39e1fafc5c1 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/com.mbeddr.mpsutil.jfreechart.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/com.mbeddr.mpsutil.jfreechart.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.jfreechart.sandbox" uuid="6d253c79-e787-4b2c-8398-677fe9f47189" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.jfreechart.sandbox" uuid="6d253c79-e787-4b2c-8398-677fe9f47189" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:032e4d4e-a71c-4d57-826e-d354d35582f1:com.mbeddr.mpsutil.jfreechart.sandboxlang" version="-1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/models/com/mbeddr/mpsutil/jfreechart/sandbox.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/models/com/mbeddr/mpsutil/jfreechart/sandbox.mps
index f33c1740a55..12ce26db766 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/models/com/mbeddr/mpsutil/jfreechart/sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.sandbox/models/com/mbeddr/mpsutil/jfreechart/sandbox.mps
@@ -7,7 +7,7 @@
   <imports />
   <registry>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/com.mbeddr.mpsutil.json.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/com.mbeddr.mpsutil.json.sandbox.msd
index 12d69c76eb4..8ff585c5f7b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/com.mbeddr.mpsutil.json.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/com.mbeddr.mpsutil.json.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.json.sandbox" uuid="def0c586-0b96-457b-823f-8a6dc4de654c" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.json.sandbox" uuid="def0c586-0b96-457b-823f-8a6dc4de654c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:b5c0bb04-c583-4b2a-a66e-1eab92d33c68:com.mbeddr.mpsutil.json" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/models/com.mbeddr.mpsutil.json.sandbox.model.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/models/com.mbeddr.mpsutil.json.sandbox.model.mps
index 33f702cf534..893d90d4598 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/models/com.mbeddr.mpsutil.json.sandbox.model.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.json.sandbox/models/com.mbeddr.mpsutil.json.sandbox.model.mps
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.msd
index 9e559593884..80083ef56c8 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.logicalChild.sandbox.sandbox" uuid="48c7bab0-f577-43cc-921f-b5c4e933be86" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.logicalChild.sandbox.sandbox" uuid="48c7bab0-f577-43cc-921f-b5c4e933be86" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">85a9bace-37a1-40af-956a-7bb1b081a77c(com.mbeddr.mpsutil.logicalChild)</dependency>
     <dependency reexport="false">286e2375-00e3-4042-b083-84873dd623be(com.mbeddr.mpsutil.logicalChild.sandbox)</dependency>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.example.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.example.mps
index 166f8c7239b..79244ba540e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.example.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.example.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/com.mbeddr.mpsutil.make.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/com.mbeddr.mpsutil.make.msd
index 4989b44d078..862f5c87ea6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/com.mbeddr.mpsutil.make.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/com.mbeddr.mpsutil.make.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.make" uuid="774cac39-6f70-4541-9ec4-ec7e470595fa" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.make" uuid="774cac39-6f70-4541-9ec4-ec7e470595fa" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -26,11 +25,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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps
index 26ef642554f..934d3a4f372 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
@@ -47,6 +47,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1211298967294" name="outsideCommandExecution" index="72QZ$" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1205851242421" name="methodDeclaration" index="32lrUH" />
@@ -71,7 +72,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -96,7 +97,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -198,7 +199,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -225,7 +226,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -248,6 +249,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -283,7 +285,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -294,7 +296,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -332,7 +334,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -350,6 +351,7 @@
     <property role="72QZ$" value="true" />
     <property role="3GE5qa" value="Make" />
     <property role="2uzpH1" value="_Rebuild Project" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="7tZeFupJFiw" role="1NuT2Z">
       <property role="TrG5h" value="mpsProject" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
@@ -466,6 +468,7 @@
     <property role="72QZ$" value="true" />
     <property role="3GE5qa" value="Make" />
     <property role="2uzpH1" value="Rebuild Model" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="7iCFfvQAMHx" role="32lrUH">
       <property role="TrG5h" value="getModels" />
       <node concept="3Tm6S6" id="7iCFfvQAMHy" role="1B3o_S" />
@@ -785,6 +788,7 @@
     <property role="72QZ$" value="true" />
     <property role="3GE5qa" value="Make" />
     <property role="2uzpH1" value="Rebuild Module" />
+    <property role="1rBW0U" value="true" />
     <node concept="2XrIbr" id="7iCFfvQP2Ri" role="32lrUH">
       <property role="TrG5h" value="getModules" />
       <node concept="3Tm6S6" id="7iCFfvQP2Rj" role="1B3o_S" />
@@ -1722,7 +1726,7 @@
                                                 <node concept="1eOMI4" id="6xMoDGgBF6n" role="2Oq$k0">
                                                   <node concept="10QFUN" id="6xMoDGgBF6o" role="1eOMHV">
                                                     <node concept="37vLTw" id="6xMoDGgBF6p" role="10QFUP">
-                                                      <ref role="3cqZAo" node="6xMoDGgBF6s" resolve="it" />
+                                                      <ref role="3cqZAo" node="2SR9xrsN2Ie" resolve="it" />
                                                     </node>
                                                     <node concept="2pR195" id="6xMoDGgBF6q" role="10QFUM">
                                                       <ref role="3uigEE" to="fn29:1Xl3kQ1uadK" resolve="MResource" />
@@ -1735,9 +1739,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="6xMoDGgBF6s" role="1bW2Oz">
+                                          <node concept="gl6BB" id="2SR9xrsN2Ie" role="1bW2Oz">
                                             <property role="TrG5h" value="it" />
-                                            <node concept="2jxLKc" id="6xMoDGgBF6t" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="2SR9xrsN2If" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -2192,14 +2196,14 @@
                             <ref role="1Pybhc" to="unno:1NYD3hytmTa" resolve="SNodeOperations" />
                             <ref role="37wK5l" to="unno:54ElNE$imKq" resolve="isGeneratable" />
                             <node concept="37vLTw" id="7iCFfvQHE7E" role="37wK5m">
-                              <ref role="3cqZAo" node="7iCFfvQHE7F" resolve="md" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ig" resolve="md" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7iCFfvQHE7F" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ig" role="1bW2Oz">
                         <property role="TrG5h" value="md" />
-                        <node concept="2jxLKc" id="7iCFfvQHE7G" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Ih" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2311,14 +2315,14 @@
                           <node concept="3clFbC" id="7iCFfvQJTIu" role="3clFbG">
                             <node concept="10Nm6u" id="7iCFfvQJTIv" role="3uHU7w" />
                             <node concept="37vLTw" id="7iCFfvQJTIw" role="3uHU7B">
-                              <ref role="3cqZAo" node="7iCFfvQJTIx" resolve="m" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ii" resolve="m" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7iCFfvQJTIx" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ii" role="1bW2Oz">
                         <property role="TrG5h" value="m" />
-                        <node concept="2jxLKc" id="7iCFfvQJTIy" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Ij" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2336,7 +2340,7 @@
                         <node concept="3clFbF" id="7iCFfvQJTID" role="3cqZAp">
                           <node concept="2OqwBi" id="7iCFfvQJTIE" role="3clFbG">
                             <node concept="37vLTw" id="7iCFfvQJTIF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7iCFfvQJTIH" resolve="m" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ik" resolve="m" />
                             </node>
                             <node concept="liA8E" id="7iCFfvQJTIG" role="2OqNvi">
                               <ref role="37wK5l" to="lui2:~SModule.isReadOnly()" resolve="isReadOnly" />
@@ -2344,9 +2348,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7iCFfvQJTIH" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ik" role="1bW2Oz">
                         <property role="TrG5h" value="m" />
-                        <node concept="2jxLKc" id="7iCFfvQJTII" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Il" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2560,14 +2564,14 @@
                             <node concept="1rXfSq" id="7iCFfvQN7Aq" role="3clFbG">
                               <ref role="37wK5l" node="3Icf_clbbfq" resolve="allModelsOf" />
                               <node concept="37vLTw" id="7iCFfvQN7Vo" role="37wK5m">
-                                <ref role="3cqZAo" node="7iCFfvQN79z" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Im" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7iCFfvQN79z" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Im" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7iCFfvQN79$" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2In" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2705,14 +2709,14 @@
                             <node concept="1rXfSq" id="7iCFfvQNyBR" role="3clFbG">
                               <ref role="37wK5l" node="3Icf_clbbfq" resolve="allModelsOf" />
                               <node concept="37vLTw" id="7iCFfvQNyTr" role="37wK5m">
-                                <ref role="3cqZAo" node="7iCFfvQNymk" resolve="gen" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Io" resolve="gen" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7iCFfvQNymk" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2Io" role="1bW2Oz">
                           <property role="TrG5h" value="gen" />
-                          <node concept="2jxLKc" id="7iCFfvQNyml" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2Ip" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/com.mbeddr.mpsutil.margincell.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/com.mbeddr.mpsutil.margincell.runtime.msd
index 3c509424a3c..03c59dcbb2e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/com.mbeddr.mpsutil.margincell.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/com.mbeddr.mpsutil.margincell.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.margincell.runtime" uuid="9ea6119e-d73d-42a8-8d7b-e60e0d7b845d" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.margincell.runtime" uuid="9ea6119e-d73d-42a8-8d7b-e60e0d7b845d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -23,7 +22,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps
index c9c97a23370..4980435e33f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
@@ -269,6 +269,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -329,7 +330,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="5232196642625575054" name="jetbrains.mps.baseLanguage.collections.structure.TailListOperation" flags="nn" index="1eb2uI">
@@ -632,7 +632,7 @@
                                       <node concept="10QFUN" id="3S$6tmXRAXr" role="1eOMHV">
                                         <node concept="2OqwBi" id="3S$6tmXRAXs" role="10QFUP">
                                           <node concept="37vLTw" id="3S$6tmXRAXt" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3S$6tmXRAY9" resolve="a" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2Iq" resolve="a" />
                                           </node>
                                           <node concept="liA8E" id="3S$6tmXRAXu" role="2OqNvi">
                                             <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
@@ -655,7 +655,7 @@
                                       <node concept="10QFUN" id="3S$6tmXRAX$" role="1eOMHV">
                                         <node concept="2OqwBi" id="3S$6tmXRAX_" role="10QFUP">
                                           <node concept="37vLTw" id="3S$6tmXRAXA" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3S$6tmXRAYb" resolve="b" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2Is" resolve="b" />
                                           </node>
                                           <node concept="liA8E" id="3S$6tmXRAXB" role="2OqNvi">
                                             <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
@@ -700,13 +700,13 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3S$6tmXRAY9" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2Iq" role="1bW2Oz">
                                 <property role="TrG5h" value="a" />
-                                <node concept="2jxLKc" id="3S$6tmXRAYa" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2Ir" role="1tU5fm" />
                               </node>
-                              <node concept="Rh6nW" id="3S$6tmXRAYb" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2Is" role="1bW2Oz">
                                 <property role="TrG5h" value="b" />
-                                <node concept="2jxLKc" id="3S$6tmXRAYc" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2It" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="3S$6tmXRAYd" role="2Dq5b$">
@@ -1024,7 +1024,7 @@
                                     <node concept="17R0WA" id="4A3glljUQL0" role="3clFbG">
                                       <node concept="2OqwBi" id="4A3glljUQL1" role="3uHU7w">
                                         <node concept="37vLTw" id="4A3glljUQL2" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4A3glljUQL7" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2Iu" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="4A3glljUQL3" role="2OqNvi">
                                           <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
@@ -1036,9 +1036,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4A3glljUQL7" role="1bW2Oz">
+                                <node concept="gl6BB" id="2SR9xrsN2Iu" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4A3glljUQL8" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2SR9xrsN2Iv" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2446,7 +2446,7 @@
                       <node concept="1rXfSq" id="1ZvNVeO9$ob" role="33vP2m">
                         <ref role="37wK5l" node="4A3glljUTZm" resolve="isSelected" />
                         <node concept="37vLTw" id="1ZvNVeO9$Vn" role="37wK5m">
-                          <ref role="3cqZAo" node="1ZvNVeO9w0k" resolve="a" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Iw" resolve="a" />
                         </node>
                       </node>
                     </node>
@@ -2458,7 +2458,7 @@
                       <node concept="1rXfSq" id="1ZvNVeO9_v1" role="33vP2m">
                         <ref role="37wK5l" node="4A3glljUTZm" resolve="isSelected" />
                         <node concept="37vLTw" id="1ZvNVeO9A71" role="37wK5m">
-                          <ref role="3cqZAo" node="1ZvNVeO9w0m" resolve="b" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Iy" resolve="b" />
                         </node>
                       </node>
                     </node>
@@ -2503,13 +2503,13 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1ZvNVeO9w0k" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Iw" role="1bW2Oz">
                   <property role="TrG5h" value="a" />
-                  <node concept="2jxLKc" id="1ZvNVeO9w0l" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Ix" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="1ZvNVeO9w0m" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Iy" role="1bW2Oz">
                   <property role="TrG5h" value="b" />
-                  <node concept="2jxLKc" id="1ZvNVeO9w0n" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Iz" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="1ZvNVeO9w0o" role="2Dq5b$">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/com.mbeddr.mpsutil.multilingual.baseLanguage.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/com.mbeddr.mpsutil.multilingual.baseLanguage.runtime.msd
index 4c3453cc2db..e7236fe7c82 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/com.mbeddr.mpsutil.multilingual.baseLanguage.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/com.mbeddr.mpsutil.multilingual.baseLanguage.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.multilingual.baseLanguage.runtime" uuid="a956e7e5-f191-4a9f-b9f2-0c44bcfea98a" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.multilingual.baseLanguage.runtime" uuid="a956e7e5-f191-4a9f-b9f2-0c44bcfea98a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">eedc5a6f-c2e8-4009-a7ab-5fc307bf77ec(com.mbeddr.mpsutil.multilingual.common.runtime)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/models/com/mbeddr/mpsutil/multilingual/baseLanguage/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/models/com/mbeddr/mpsutil/multilingual/baseLanguage/runtime/plugin.mps
index 9e1d80adf75..5ca866eeeea 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/models/com/mbeddr/mpsutil/multilingual/baseLanguage/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.baselanguage.runtime/models/com/mbeddr/mpsutil/multilingual/baseLanguage/runtime/plugin.mps
@@ -8,13 +8,13 @@
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/com.mbeddr.mpsutil.multilingual.common.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/com.mbeddr.mpsutil.multilingual.common.runtime.msd
index f5bfc71e742..3f015b55961 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/com.mbeddr.mpsutil.multilingual.common.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/com.mbeddr.mpsutil.multilingual.common.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.multilingual.common.runtime" uuid="eedc5a6f-c2e8-4009-a7ab-5fc307bf77ec" moduleVersion="0" pluginKind="PLUGIN_CORE" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.multilingual.common.runtime" uuid="eedc5a6f-c2e8-4009-a7ab-5fc307bf77ec" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">371850a9-2c5b-4e1d-a811-70d97e847917(com.mbeddr.mpsutil.editor.utils)</dependency>
@@ -23,13 +22,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/models/com/mbeddr/mpsutil/multilingual/common/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/models/com/mbeddr/mpsutil/multilingual/common/runtime/plugin.mps
index 5efcfd3b7ee..01a5fbea4c2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/models/com/mbeddr/mpsutil/multilingual/common/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.common.runtime/models/com/mbeddr/mpsutil/multilingual/common/runtime/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -21,11 +21,11 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="grbm" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3.text(org.apache.commons/)" />
     <import index="tp5r" ref="r:3ef5075b-89c5-437c-8971-b29ab29bb322(com.mbeddr.mpsutil.multilingual.common.behavior)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
-    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
+    <import index="dr5r" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.logging(JDK/)" />
+    <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" implicit="true" />
   </imports>
@@ -155,7 +155,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -179,7 +179,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -218,6 +218,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -273,7 +274,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -295,7 +296,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -681,7 +681,7 @@
                               </node>
                               <node concept="2OqwBi" id="7Ssz$kY9Nut" role="3uHU7w">
                                 <node concept="37vLTw" id="7Ssz$kY9NoA" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7Ssz$kY9MSc" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2I$" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="7Ssz$kY9NPQ" role="2OqNvi">
                                   <ref role="3TsBF5" to="sxyo:vzhXZP_pYH" resolve="languageCode" />
@@ -691,7 +691,7 @@
                             <node concept="2OqwBi" id="2GRHOLIPhvo" role="3uHU7w">
                               <node concept="2OqwBi" id="2GRHOLIPguX" role="2Oq$k0">
                                 <node concept="37vLTw" id="2GRHOLIPglt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7Ssz$kY9MSc" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2I$" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="2GRHOLIPgSd" role="2OqNvi">
                                   <ref role="3TsBF5" to="sxyo:vzhXZP_pYI" resolve="countryCode" />
@@ -702,9 +702,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7Ssz$kY9MSc" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2I$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7Ssz$kY9MSd" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2I_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -735,7 +735,7 @@
                             <node concept="17R0WA" id="77gEP6zyd7Y" role="3uHU7w">
                               <node concept="2OqwBi" id="77gEP6zyd7Z" role="3uHU7w">
                                 <node concept="37vLTw" id="77gEP6zyd80" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="77gEP6zyd88" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2IA" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="77gEP6zyd81" role="2OqNvi">
                                   <ref role="3TsBF5" to="sxyo:vzhXZP_pYI" resolve="countryCode" />
@@ -751,7 +751,7 @@
                               </node>
                               <node concept="2OqwBi" id="77gEP6zyd85" role="3uHU7w">
                                 <node concept="37vLTw" id="77gEP6zyd86" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="77gEP6zyd88" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2IA" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="77gEP6zyd87" role="2OqNvi">
                                   <ref role="3TsBF5" to="sxyo:vzhXZP_pYH" resolve="languageCode" />
@@ -761,9 +761,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="77gEP6zyd88" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2IA" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="77gEP6zyd89" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2IB" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -796,7 +796,7 @@
                           <node concept="17R0WA" id="2GRHOLINsh6" role="3clFbG">
                             <node concept="2OqwBi" id="2GRHOLINsyk" role="3uHU7w">
                               <node concept="37vLTw" id="2GRHOLINsqC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2GRHOLINrvg" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2IC" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2GRHOLINsVj" role="2OqNvi">
                                 <ref role="3TsBF5" to="sxyo:vzhXZP_pYH" resolve="languageCode" />
@@ -808,9 +808,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2GRHOLINrvg" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2IC" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2GRHOLINrvh" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2ID" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1179,7 +1179,7 @@
                         </node>
                         <node concept="2OqwBi" id="2d55UFtkGVR" role="3uHU7B">
                           <node concept="37vLTw" id="2d55UFtkGVS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2d55UFtkGW1" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2IE" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2d55UFtkGVT" role="2OqNvi">
                             <ref role="3TsBF5" to="sxyo:vzhXZP_pZo" resolve="default" />
@@ -1188,9 +1188,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2d55UFtkGW1" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2IE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2d55UFtkGW2" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2IF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1286,14 +1286,14 @@
                             <ref role="1Pybhc" to="btm1:~StringUtils" resolve="StringUtils" />
                             <ref role="37wK5l" to="btm1:~StringUtils.isNotBlank(java.lang.CharSequence)" resolve="isNotBlank" />
                             <node concept="37vLTw" id="vzhXZPAXZN" role="37wK5m">
-                              <ref role="3cqZAo" node="vzhXZPAXZO" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2IG" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="vzhXZPAXZO" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2IG" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="vzhXZPAXZP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2IH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1883,7 +1883,7 @@
                         <node concept="17R0WA" id="7NARB4mNhgt" role="3clFbG">
                           <node concept="2OqwBi" id="7NARB4mNhgu" role="3uHU7B">
                             <node concept="37vLTw" id="7NARB4mNhgv" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7NARB4mNh12" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2II" resolve="it" />
                             </node>
                             <node concept="liA8E" id="7NARB4mNhgw" role="2OqNvi">
                               <ref role="37wK5l" to="33ny:~Locale.getLanguage()" resolve="getLanguage" />
@@ -1895,9 +1895,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7NARB4mNh12" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2II" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7NARB4mNh13" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2IJ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1918,7 +1918,7 @@
                             <node concept="2OqwBi" id="4TPMxte07JM" role="3K4Cdx">
                               <node concept="2OqwBi" id="4TPMxte06zg" role="2Oq$k0">
                                 <node concept="37vLTw" id="4TPMxte06aC" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4TPMxtdYRr4" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2IK" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="4TPMxte079p" role="2OqNvi">
                                   <ref role="37wK5l" to="33ny:~Locale.getVariant()" resolve="getVariant" />
@@ -1939,7 +1939,7 @@
                             <node concept="2OqwBi" id="4TPMxte0Jno" role="3K4Cdx">
                               <node concept="2OqwBi" id="4TPMxte0Jnp" role="2Oq$k0">
                                 <node concept="37vLTw" id="4TPMxte0Jnq" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4TPMxtdYRr4" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2IK" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="4TPMxte10Vi" role="2OqNvi">
                                   <ref role="37wK5l" to="33ny:~Locale.getScript()" resolve="getScript" />
@@ -1952,9 +1952,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4TPMxtdYRr4" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2IK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4TPMxtdYRr5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2IL" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="4TPMxtdYRr6" role="2S7zOq">
@@ -2007,7 +2007,7 @@
                             <node concept="2OqwBi" id="7NARB4mNt2V" role="3uHU7w">
                               <node concept="2OqwBi" id="7NARB4mNt2W" role="2Oq$k0">
                                 <node concept="37vLTw" id="7NARB4mNt2X" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7NARB4mNt38" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2IM" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="7NARB4mNt2Y" role="2OqNvi">
                                   <ref role="37wK5l" to="33ny:~Locale.getCountry()" resolve="getCountry" />
@@ -2026,7 +2026,7 @@
                         <node concept="17R0WA" id="7NARB4mNt33" role="3uHU7w">
                           <node concept="2OqwBi" id="7NARB4mNt34" role="3uHU7B">
                             <node concept="37vLTw" id="7NARB4mNt35" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7NARB4mNt38" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2IM" resolve="it" />
                             </node>
                             <node concept="liA8E" id="7NARB4mNt36" role="2OqNvi">
                               <ref role="37wK5l" to="33ny:~Locale.getCountry()" resolve="getCountry" />
@@ -2039,9 +2039,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7NARB4mNt38" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2IM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7NARB4mNt39" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2IN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2401,17 +2401,27 @@
           <node concept="3cpWsn" id="nrFIWUkOTK" role="3cpWs9">
             <property role="TrG5h" value="log" />
             <node concept="3uibUv" id="nrFIWUkOTL" role="1tU5fm">
-              <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
-            </node>
-            <node concept="2YIFZM" id="nrFIWUkPFp" role="33vP2m">
-              <ref role="37wK5l" to="q7tw:~LogManager.getLogger(java.lang.Class)" resolve="getLogger" />
-              <ref role="1Pybhc" to="q7tw:~LogManager" resolve="LogManager" />
-              <node concept="2OqwBi" id="nrFIWUkPVn" role="37wK5m">
-                <node concept="37vLTw" id="nrFIWUkPS_" role="2Oq$k0">
-                  <ref role="3cqZAo" node="nrFIWUjo3K" resolve="classLoader" />
-                </node>
-                <node concept="liA8E" id="nrFIWUkXCo" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
+              <ref role="3uigEE" to="dr5r:~Logger" resolve="Logger" />
+            </node>
+            <node concept="2OqwBi" id="5EH2I6rnTU2" role="33vP2m">
+              <node concept="2YIFZM" id="5EH2I6rnTHY" role="2Oq$k0">
+                <ref role="37wK5l" to="dr5r:~LogManager.getLogManager()" resolve="getLogManager" />
+                <ref role="1Pybhc" to="dr5r:~LogManager" resolve="LogManager" />
+              </node>
+              <node concept="liA8E" id="5EH2I6rnUfw" role="2OqNvi">
+                <ref role="37wK5l" to="dr5r:~LogManager.getLogger(java.lang.String)" resolve="getLogger" />
+                <node concept="2OqwBi" id="5EH2I6rnVl6" role="37wK5m">
+                  <node concept="2OqwBi" id="5EH2I6rnTHZ" role="2Oq$k0">
+                    <node concept="37vLTw" id="5EH2I6rnTI0" role="2Oq$k0">
+                      <ref role="3cqZAo" node="nrFIWUjo3K" resolve="classLoader" />
+                    </node>
+                    <node concept="liA8E" id="5EH2I6rnTI1" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="5EH2I6ro0Nq" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -2421,14 +2431,14 @@
           <node concept="3cpWsn" id="nrFIWUl37Y" role="3cpWs9">
             <property role="TrG5h" value="oldLevel" />
             <node concept="3uibUv" id="nrFIWUl37L" role="1tU5fm">
-              <ref role="3uigEE" to="q7tw:~Level" resolve="Level" />
+              <ref role="3uigEE" to="dr5r:~Level" resolve="Level" />
             </node>
             <node concept="2OqwBi" id="nrFIWUl37Z" role="33vP2m">
               <node concept="37vLTw" id="nrFIWUl380" role="2Oq$k0">
                 <ref role="3cqZAo" node="nrFIWUkOTK" resolve="log" />
               </node>
               <node concept="liA8E" id="nrFIWUl381" role="2OqNvi">
-                <ref role="37wK5l" to="q7tw:~Category.getLevel()" resolve="getLevel" />
+                <ref role="37wK5l" to="dr5r:~Logger.getLevel()" resolve="getLevel" />
               </node>
             </node>
           </node>
@@ -2441,10 +2451,10 @@
                   <ref role="3cqZAo" node="nrFIWUkOTK" resolve="log" />
                 </node>
                 <node concept="liA8E" id="nrFIWUl1DW" role="2OqNvi">
-                  <ref role="37wK5l" to="q7tw:~Category.setLevel(org.apache.log4j.Level)" resolve="setLevel" />
-                  <node concept="10M0yZ" id="nrFIWUl3Ud" role="37wK5m">
-                    <ref role="1PxDUh" to="q7tw:~Level" resolve="Level" />
-                    <ref role="3cqZAo" to="q7tw:~Level.ERROR" resolve="ERROR" />
+                  <ref role="37wK5l" to="dr5r:~Logger.setLevel(java.util.logging.Level)" resolve="setLevel" />
+                  <node concept="10M0yZ" id="5EH2I6ro23l" role="37wK5m">
+                    <ref role="3cqZAo" to="dr5r:~Level.SEVERE" resolve="SEVERE" />
+                    <ref role="1PxDUh" to="dr5r:~Level" resolve="Level" />
                   </node>
                 </node>
               </node>
@@ -2492,7 +2502,7 @@
                     <ref role="3cqZAo" node="nrFIWUkOTK" resolve="log" />
                   </node>
                   <node concept="liA8E" id="nrFIWUl6Ru" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.setLevel(org.apache.log4j.Level)" resolve="setLevel" />
+                    <ref role="37wK5l" to="dr5r:~Logger.setLevel(java.util.logging.Level)" resolve="setLevel" />
                     <node concept="37vLTw" id="nrFIWUl6Sy" role="37wK5m">
                       <ref role="3cqZAo" node="nrFIWUl37Y" resolve="oldLevel" />
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/com.mbeddr.mpsutil.multilingual.concept.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/com.mbeddr.mpsutil.multilingual.concept.runtime.msd
index ed690742b58..6d15c8be8bc 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/com.mbeddr.mpsutil.multilingual.concept.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/com.mbeddr.mpsutil.multilingual.concept.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.multilingual.concept.runtime" uuid="c038e2c4-0a5f-47e2-a3e8-327c1084f6a1" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.multilingual.concept.runtime" uuid="c038e2c4-0a5f-47e2-a3e8-327c1084f6a1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -22,7 +21,7 @@
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/models/com/mbeddr/mpsutil/multilingual/concept/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/models/com/mbeddr/mpsutil/multilingual/concept/runtime/plugin.mps
index 820555c9df5..b6a7bb5bb03 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/models/com/mbeddr/mpsutil/multilingual/concept/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.concept.runtime/models/com/mbeddr/mpsutil/multilingual/concept/runtime/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -111,7 +111,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,7 +126,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -136,12 +136,12 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/com.mbeddr.mpsutil.multilingual.settings.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/com.mbeddr.mpsutil.multilingual.settings.runtime.msd
index 016f135286c..dbece74f237 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/com.mbeddr.mpsutil.multilingual.settings.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/com.mbeddr.mpsutil.multilingual.settings.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.multilingual.settings.runtime" uuid="398042e9-b575-4f91-8b67-c183f10af03e" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.multilingual.settings.runtime" uuid="398042e9-b575-4f91-8b67-c183f10af03e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">23f985f2-965f-4af1-aee8-a32677429514(com.mbeddr.mpsutil.multilingual.common)</dependency>
@@ -30,12 +29,12 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <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>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/models/com/mbeddr/mpsutil/multilingual/settings/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/models/com/mbeddr/mpsutil/multilingual/settings/runtime/plugin.mps
index 3521adb8337..4957fe0668f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/models/com/mbeddr/mpsutil/multilingual/settings/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.multilingual.settings.runtime/models/com/mbeddr/mpsutil/multilingual/settings/runtime/plugin.mps
@@ -5,9 +5,9 @@
     <use id="1e7c1f95-336c-4cec-b00e-8cc6e0c2b265" name="com.mbeddr.mpsutil.preferenceform" version="0" />
     <use id="23f985f2-965f-4af1-aee8-a32677429514" name="com.mbeddr.mpsutil.multilingual.common" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d2a1d976-43a2-462f-ac3a-9b258ced839d" name="com.mbeddr.mpsutil.multilingual.baseLanguage" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -109,7 +109,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -148,6 +148,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -158,7 +159,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -190,7 +191,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -211,7 +212,7 @@
         <property id="568377005202317272" name="default" index="3MtHw7" />
         <property id="568377005202317271" name="technicalKey" index="3MtHw8" />
       </concept>
-      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
+      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
         <reference id="2510545900188083932" name="key" index="3ZOmrH" />
       </concept>
     </language>
@@ -223,7 +224,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -355,7 +355,7 @@
                                 <node concept="3cpWs3" id="IoI2Md$$$x" role="37wK5m">
                                   <node concept="2OqwBi" id="IoI2Md$$$y" role="3uHU7w">
                                     <node concept="37vLTw" id="IoI2Md$$$z" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="IoI2Md$$$H" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2IO" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="IoI2Md$$$$" role="2OqNvi">
                                       <ref role="3TsBF5" to="sxyo:vzhXZP_pYI" resolve="countryCode" />
@@ -364,7 +364,7 @@
                                   <node concept="3cpWs3" id="IoI2Md$$$_" role="3uHU7B">
                                     <node concept="2OqwBi" id="IoI2Md$$$A" role="3uHU7B">
                                       <node concept="37vLTw" id="IoI2Md$$$B" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="IoI2Md$$$H" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2IO" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="IoI2Md$$$C" role="2OqNvi">
                                         <ref role="3TsBF5" to="sxyo:vzhXZP_pYH" resolve="languageCode" />
@@ -377,7 +377,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="IoI2Md$$$E" role="37wK5m">
                                   <node concept="37vLTw" id="IoI2Md$$$F" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="IoI2Md$$$H" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2IO" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="IoI2Md$$$G" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -387,9 +387,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="IoI2Md$$$H" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2IO" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="IoI2Md$$$I" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2IP" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -418,7 +418,7 @@
                         <node concept="3clFbF" id="IoI2Md$En_" role="3cqZAp">
                           <node concept="2OqwBi" id="IoI2Md$EHS" role="3clFbG">
                             <node concept="37vLTw" id="IoI2Md$En$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="IoI2Md$DK4" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2IQ" resolve="it" />
                             </node>
                             <node concept="liA8E" id="IoI2Md$GHR" role="2OqNvi">
                               <ref role="37wK5l" to="fw73:IoI2MdzBeS" resolve="getLanguages" />
@@ -426,9 +426,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="IoI2Md$DK4" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2IQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="IoI2Md$DK5" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2IR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -443,7 +443,7 @@
                             <node concept="3cpWs3" id="IoI2Md$OEJ" role="37wK5m">
                               <node concept="2OqwBi" id="IoI2Md$OEK" role="3uHU7w">
                                 <node concept="37vLTw" id="IoI2Md$OEL" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="IoI2Md$KNq" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2IS" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="IoI2Md$OEM" role="2OqNvi">
                                   <ref role="3TsBF5" to="sxyo:vzhXZP_pYI" resolve="countryCode" />
@@ -452,7 +452,7 @@
                               <node concept="3cpWs3" id="IoI2Md$OEN" role="3uHU7B">
                                 <node concept="2OqwBi" id="IoI2Md$OEO" role="3uHU7B">
                                   <node concept="37vLTw" id="IoI2Md$OEP" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="IoI2Md$KNq" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2IS" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="IoI2Md$OEQ" role="2OqNvi">
                                     <ref role="3TsBF5" to="sxyo:vzhXZP_pYH" resolve="languageCode" />
@@ -465,7 +465,7 @@
                             </node>
                             <node concept="2OqwBi" id="IoI2Md$OES" role="37wK5m">
                               <node concept="37vLTw" id="IoI2Md$OET" role="2Oq$k0">
-                                <ref role="3cqZAo" node="IoI2Md$KNq" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2IS" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="IoI2Md$OEU" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -475,9 +475,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="IoI2Md$KNq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2IS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="IoI2Md$KNr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2IT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
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 37ca9cb7c40..05af109fa17 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.nodeaccess" uuid="b6f172c1-d3af-40cd-a1c3-ef9952e306b3" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.nodeaccess" uuid="b6f172c1-d3af-40cd-a1c3-ef9952e306b3" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -29,14 +28,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:817e4e70-961e-4a95-98a1-15e9f32231f1:jetbrains.mps.ide.httpsupport" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps
index adb6d4f7946..7b251ddce5a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps
@@ -3,10 +3,10 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
@@ -49,6 +49,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -74,7 +75,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -99,7 +100,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -193,7 +194,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -221,7 +222,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -249,6 +250,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -286,7 +288,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -332,7 +334,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -349,7 +351,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -897,7 +898,7 @@
                             <node concept="2OqwBi" id="7CAL8BWhzM" role="3clFbG">
                               <node concept="2OqwBi" id="7CAL8BWhzN" role="2Oq$k0">
                                 <node concept="37vLTw" id="7CAL8BWhzO" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7CAL8BWhzS" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2IU" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="7CAL8BWhzP" role="2OqNvi">
                                   <ref role="37wK5l" to="z1c3:~Project.getName()" resolve="getName" />
@@ -912,9 +913,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7CAL8BWhzS" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2IU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7CAL8BWhzT" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2IV" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1740,6 +1741,7 @@
     <property role="TrG5h" value="copyNodeInfoToClipboard" />
     <property role="2uzpH1" value="Copy Node Info to Clipboard" />
     <property role="3GE5qa" value="clipboard" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2N1CSrzm3gT" role="tncku">
       <node concept="3clFbS" id="2N1CSrzm3gU" role="2VODD2">
         <node concept="3cpWs8" id="2N1CSrzm3gV" role="3cqZAp">
@@ -2202,6 +2204,7 @@
     <property role="TrG5h" value="copyXMLNodeToClipboard" />
     <property role="2uzpH1" value="Copy Node as XML" />
     <property role="3GE5qa" value="clipboard.xml" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2N1CSrzm3k6" role="tncku">
       <node concept="3clFbS" id="2N1CSrzm3k7" role="2VODD2">
         <node concept="3cpWs8" id="2N1CSrzm3k8" role="3cqZAp">
@@ -2294,6 +2297,7 @@
     <property role="TrG5h" value="pasteXMLNodeFromClipboard" />
     <property role="2uzpH1" value="Paste XML Node" />
     <property role="3GE5qa" value="clipboard.xml" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2N1CSrzm3kF" role="tncku">
       <node concept="3clFbS" id="2N1CSrzm3kG" role="2VODD2">
         <node concept="3J1_TO" id="2N1CSrzm3kH" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/com.mbeddr.mpsutil.nodediff.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/com.mbeddr.mpsutil.nodediff.msd
index e79018c67e4..ede169d1ea2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/com.mbeddr.mpsutil.nodediff.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/com.mbeddr.mpsutil.nodediff.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.nodediff" uuid="a763cf3d-9538-4243-83f6-e47be36aefa3" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.nodediff" uuid="a763cf3d-9538-4243-83f6-e47be36aefa3" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform)</dependency>
@@ -25,12 +24,12 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps
index 145139db662..3aad94e8aea 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
@@ -41,6 +41,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -65,7 +66,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -90,7 +91,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -165,7 +166,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -189,7 +190,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -225,7 +226,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -257,7 +258,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -916,6 +917,7 @@
   <node concept="sE7Ow" id="2rgL4xy7$ZN">
     <property role="TrG5h" value="markFirstNode" />
     <property role="2uzpH1" value="Set as First Node in Diff" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2rgL4xy7$ZO" role="tncku">
       <node concept="3clFbS" id="2rgL4xy7$ZP" role="2VODD2">
         <node concept="3clFbF" id="2rgL4xy7ACZ" role="3cqZAp">
@@ -945,6 +947,7 @@
   <node concept="sE7Ow" id="2rgL4xy7AJl">
     <property role="TrG5h" value="markSecondAndDiff" />
     <property role="2uzpH1" value="Show Diff with First Node" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2rgL4xy7AJm" role="tncku">
       <node concept="3clFbS" id="2rgL4xy7AJn" role="2VODD2">
         <node concept="3clFbF" id="2rgL4xy7AJo" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox.msd
index e3a73091c26..1204619dcfc 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox/com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox" uuid="eff2ce1c-8edf-441d-8532-f341f1ce6d17" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.parameterizedMenu.sandbox.sandbox" uuid="eff2ce1c-8edf-441d-8532-f341f1ce6d17" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:0280da2d-83c6-47d3-bddd-baff7e1a110f:com.mbeddr.mpsutil.parameterizedMenu.sandbox" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/com.mbeddr.mpsutil.placeholderTextList.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/com.mbeddr.mpsutil.placeholderTextList.runtime.msd
index f445f02422a..62215f47999 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/com.mbeddr.mpsutil.placeholderTextList.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/com.mbeddr.mpsutil.placeholderTextList.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.placeholderTextList.runtime" uuid="b8cd51c2-0845-4e1a-be50-29c6044bc90f" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.placeholderTextList.runtime" uuid="b8cd51c2-0845-4e1a-be50-29c6044bc90f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/models/com/mbeddr/mpsutil/placeholderTextList/runtime/rt.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/models/com/mbeddr/mpsutil/placeholderTextList/runtime/rt.mps
index 203dde0de20..58f5f093e8d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/models/com/mbeddr/mpsutil/placeholderTextList/runtime/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/models/com/mbeddr/mpsutil/placeholderTextList/runtime/rt.mps
@@ -25,7 +25,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
@@ -78,7 +78,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,7 +93,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -105,7 +105,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps
index 23b499b8f3a..03502682693 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
@@ -64,6 +64,7 @@
         <property id="1207149998849" name="isAlwaysVisible" index="fJN8o" />
         <property id="1215865999894" name="mnemonic" index="ngHcd" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1227008813498" name="constructionParameter" index="2JrayB" />
@@ -126,7 +127,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -138,7 +139,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -177,7 +178,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -331,7 +332,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -362,7 +363,7 @@
         <child id="1202077744034" name="visibility" index="3xqFEP" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -405,6 +406,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -428,7 +430,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -468,7 +470,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -503,7 +505,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -2667,6 +2668,7 @@
     <property role="TrG5h" value="ZoomIn" />
     <property role="2uzpH1" value="Zoom In" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="18ZQ$P82xbs" role="tncku">
       <node concept="3clFbS" id="18ZQ$P82xbt" role="2VODD2">
         <node concept="3cpWs8" id="18ZQ$P85bR_" role="3cqZAp">
@@ -2713,6 +2715,7 @@
     <property role="TrG5h" value="VisualizeAction" />
     <property role="2uzpH1" value="Visualize" />
     <property role="ngHcd" value="V" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="5BkFC2yhAHn" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -2888,6 +2891,7 @@
     <property role="TrG5h" value="ZoomOut" />
     <property role="2uzpH1" value="Zoom Out" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2sPLpCfQjiA" role="tncku">
       <node concept="3clFbS" id="2sPLpCfQjiB" role="2VODD2">
         <node concept="3cpWs8" id="2sPLpCfQjiC" role="3cqZAp">
@@ -2934,6 +2938,7 @@
     <property role="TrG5h" value="Save" />
     <property role="2uzpH1" value="Save as *.svg" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2sPLpCfQjiU" role="tncku">
       <node concept="3clFbS" id="2sPLpCfQjiV" role="2VODD2">
         <node concept="3cpWs8" id="2aP19v2Ult6" role="3cqZAp">
@@ -3142,6 +3147,10 @@
   </node>
   <node concept="312cEu" id="2sPLpCfQsmQ">
     <property role="TrG5h" value="PlantUMLSVGCanvas" />
+    <node concept="3Tm1VV" id="2sPLpCfQsmR" role="1B3o_S" />
+    <node concept="3uibUv" id="2sPLpCfQ$Lm" role="1zkMxy">
+      <ref role="3uigEE" to="er5d:~JSVGCanvas" resolve="JSVGCanvas" />
+    </node>
     <node concept="2tJIrI" id="5gmO3pL7GYO" role="jymVt" />
     <node concept="312cEg" id="5gmO3pL7KrD" role="jymVt">
       <property role="TrG5h" value="svgScale" />
@@ -3169,10 +3178,6 @@
     </node>
     <node concept="2tJIrI" id="5gmO3pL7WRn" role="jymVt" />
     <node concept="2tJIrI" id="5gmO3pL7I9J" role="jymVt" />
-    <node concept="3Tm1VV" id="2sPLpCfQsmR" role="1B3o_S" />
-    <node concept="3uibUv" id="2sPLpCfQ$Lm" role="1zkMxy">
-      <ref role="3uigEE" to="er5d:~JSVGCanvas" resolve="JSVGCanvas" />
-    </node>
     <node concept="3clFbW" id="2sPLpCfQsmS" role="jymVt">
       <node concept="3cqZAl" id="2sPLpCfQsmT" role="3clF45" />
       <node concept="3Tm1VV" id="2sPLpCfQsmU" role="1B3o_S" />
@@ -5177,6 +5182,7 @@
     <property role="TrG5h" value="Reset" />
     <property role="2uzpH1" value="Reset" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rGUK" role="tncku">
       <node concept="3clFbS" id="4ppn3W9rGUL" role="2VODD2">
         <node concept="3cpWs8" id="4ppn3W9rGUM" role="3cqZAp">
@@ -5224,6 +5230,7 @@
     <property role="2uzpH1" value="Previous Visualization" />
     <property role="3GE5qa" value="toolbar" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rIR9" role="tncku">
       <node concept="3clFbS" id="4ppn3W9rIRa" role="2VODD2">
         <node concept="3clFbF" id="2aP19v30Ubv" role="3cqZAp">
@@ -5282,6 +5289,7 @@
     <property role="2uzpH1" value="Next Visualization" />
     <property role="3GE5qa" value="toolbar" />
     <property role="fJN8o" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rIRf" role="tncku">
       <node concept="3clFbS" id="4ppn3W9rIRg" role="2VODD2">
         <node concept="3clFbF" id="2aP19v30Ucv" role="3cqZAp">
@@ -5503,7 +5511,7 @@
                         <node concept="2OqwBi" id="2aP19v3129F" role="3uHU7w">
                           <node concept="2OqwBi" id="2aP19v3129G" role="2Oq$k0">
                             <node concept="37vLTw" id="2aP19v3129H" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2aP19v3129o" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2IW" resolve="it" />
                             </node>
                             <node concept="2S8uIT" id="2aP19v3129I" role="2OqNvi">
                               <ref role="2S8YL0" node="2aP19v311Mu" resolve="category" />
@@ -5519,7 +5527,7 @@
                         <node concept="2OqwBi" id="2aP19v3129L" role="3uHU7B">
                           <node concept="2OqwBi" id="2aP19v3129M" role="2Oq$k0">
                             <node concept="37vLTw" id="2aP19v3129N" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2aP19v3129o" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2IW" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="2aP19v3129O" role="2OqNvi">
                               <ref role="2Oxat5" node="2aP19v311YL" resolve="nPtr" />
@@ -5535,9 +5543,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2aP19v3129o" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2IW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2aP19v3129R" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2IX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6068,6 +6076,7 @@
     <property role="TrG5h" value="CopySources" />
     <property role="2uzpH1" value="Copy sources to clipboard" />
     <property role="3GE5qa" value="toolbar" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6IuaPRfaRik" role="tncku">
       <node concept="3clFbS" id="6IuaPRfaRil" role="2VODD2">
         <node concept="3cpWs8" id="6IuaPRfaRim" role="3cqZAp">
@@ -6164,6 +6173,7 @@
   <node concept="sE7Ow" id="bhVSeGf3sb">
     <property role="TrG5h" value="VisualizeActionParametrized" />
     <property role="2uzpH1" value="Visualize" />
+    <property role="1rBW0U" value="true" />
     <node concept="2JriF1" id="bhVSeGf4__" role="2JrayB">
       <property role="TrG5h" value="cat" />
       <node concept="3Tm6S6" id="bhVSeGf4_A" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd
index 9f58aa25790..af0e3a5ff64 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.plantuml.pluginSolution" uuid="c0488c1e-322f-4f38-92d4-5520a7ce96c1" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.plantuml.pluginSolution" uuid="c0488c1e-322f-4f38-92d4-5520a7ce96c1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -12,13 +12,10 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/plantuml.jar" />
+      <library location="${module}/lib/rhino-1.7.10.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/plantuml.jar" />
-    <stubModelEntry path="${module}/lib/rhino-1.7.10.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -32,14 +29,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime.msd
index f095c4c0e86..4e2c4f4d6ae 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime" uuid="2924833e-8f11-4109-ac0b-20d5a2f3291a" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime" uuid="2924833e-8f11-4109-ac0b-20d5a2f3291a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -20,7 +19,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps
index 52d5ae7cc27..6841f3e404d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -91,7 +91,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -109,7 +109,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -147,7 +147,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/com.mbeddr.mpsutil.preferenceform.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/com.mbeddr.mpsutil.preferenceform.runtime.msd
index 7d924e29abe..60969588efe 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/com.mbeddr.mpsutil.preferenceform.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/com.mbeddr.mpsutil.preferenceform.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.preferenceform.runtime" uuid="32addf6f-1f14-40cb-991d-e0fddb7506c1" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.preferenceform.runtime" uuid="32addf6f-1f14-40cb-991d-e0fddb7506c1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -20,7 +19,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <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.preferenceform.runtime/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/.model
index 85a638a3833..32fa2750a26 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/.model
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/.model
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="content" value="header" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormComponent.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormComponent.mpsr
index 8605b00ea42..41dba5cd3f5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormComponent.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormComponent.mpsr
@@ -67,7 +67,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -82,7 +82,7 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -90,6 +90,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -99,7 +100,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -115,7 +116,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
     </language>
   </registry>
@@ -215,7 +215,7 @@
                   <node concept="3clFbF" id="X7OD3WrPuL" role="3cqZAp">
                     <node concept="2OqwBi" id="X7OD3WrPBY" role="3clFbG">
                       <node concept="37vLTw" id="X7OD3WrPuK" role="2Oq$k0">
-                        <ref role="3cqZAo" node="X7OD3WrPgX" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2IY" resolve="it" />
                       </node>
                       <node concept="liA8E" id="X7OD3WrQde" role="2OqNvi">
                         <ref role="37wK5l" node="~BasePrefsPage.register():void" resolve="register" />
@@ -223,9 +223,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="X7OD3WrPgX" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2IY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="X7OD3WrPgY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2IZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -256,7 +256,7 @@
                   <node concept="3clFbF" id="X7OD3WrRUY" role="3cqZAp">
                     <node concept="2OqwBi" id="X7OD3WrS4b" role="3clFbG">
                       <node concept="37vLTw" id="X7OD3WrRUX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="X7OD3WrRHa" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2J0" resolve="it" />
                       </node>
                       <node concept="liA8E" id="X7OD3WrStq" role="2OqNvi">
                         <ref role="37wK5l" node="~BasePrefsPage.unregister():void" resolve="unregister" />
@@ -264,9 +264,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="X7OD3WrRHa" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2J0" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="X7OD3WrRHb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2J1" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr
index 90c0409bc9e..e90d624d910 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr
@@ -19,7 +19,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -118,7 +118,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -136,7 +136,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -155,7 +155,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/DynamicComboBoxEntry.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/DynamicComboBoxEntry.mpsr
index 7db69104e41..c797d1fa534 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/DynamicComboBoxEntry.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/DynamicComboBoxEntry.mpsr
@@ -14,7 +14,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -62,14 +62,14 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -79,7 +79,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationComponentBase.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationComponentBase.mpsr
index a5663bbb6fd..bbe8ea46bde 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationComponentBase.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationComponentBase.mpsr
@@ -18,7 +18,7 @@
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -27,7 +27,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -37,7 +37,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationConfigurableBase.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationConfigurableBase.mpsr
index 6845b7986b6..f9eb3e91457 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationConfigurableBase.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormApplicationConfigurableBase.mpsr
@@ -13,7 +13,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -57,7 +57,7 @@
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -67,7 +67,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -76,7 +76,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectComponentBase.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectComponentBase.mpsr
index 4620b04cea7..e6eb52f7496 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectComponentBase.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectComponentBase.mpsr
@@ -59,7 +59,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -69,7 +69,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -83,7 +83,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectConfigurableBase.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectConfigurableBase.mpsr
index 3dc7a7b7430..1fa13074b79 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectConfigurableBase.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/PreferenceFormProjectConfigurableBase.mpsr
@@ -20,7 +20,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -77,7 +77,7 @@
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,7 +93,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -104,7 +104,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/com.mbeddr.mpsutil.print.pluginSolution.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/com.mbeddr.mpsutil.print.pluginSolution.msd
index a6c0239cb27..6a52e258082 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/com.mbeddr.mpsutil.print.pluginSolution.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/com.mbeddr.mpsutil.print.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.print.pluginSolution" uuid="d74f63a2-18ad-4eb9-848b-ff6178cddeb3" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.print.pluginSolution" uuid="d74f63a2-18ad-4eb9-848b-ff6178cddeb3" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -20,7 +19,7 @@
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps
index 05574272906..790ff502902 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
@@ -49,7 +49,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -140,7 +140,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -159,7 +159,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -181,12 +181,12 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/com.mbeddr.mpsutil.process.extension.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/com.mbeddr.mpsutil.process.extension.sandbox.msd
index 6917343a625..687a75369cf 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/com.mbeddr.mpsutil.process.extension.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/com.mbeddr.mpsutil.process.extension.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.process.extension.sandbox" uuid="ce20281c-8d48-478c-a84b-9c3536330bd5" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.process.extension.sandbox" uuid="ce20281c-8d48-478c-a84b-9c3536330bd5" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">4df82fd0-088a-4158-85ec-920403c10e72(com.mbeddr.mpsutil.process.sandbox)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -21,14 +20,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/models/com/mbeddr/mpsutil/process/extension/sandbox/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/models/com/mbeddr/mpsutil/process/extension/sandbox/plugin.mps
index e22bc050753..1bc0204240c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/models/com/mbeddr/mpsutil/process/extension/sandbox/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.extension.sandbox/models/com/mbeddr/mpsutil/process/extension/sandbox/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:aad09bab-646f-4c77-9edc-30839bc868a8(com.mbeddr.mpsutil.process.extension.sandbox.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="306d7456-29e2-4ea3-9c46-e7b830b08481" name="com.mbeddr.mpsutil.process" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -73,7 +73,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -119,12 +119,12 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/com.mbeddr.mpsutil.process.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/com.mbeddr.mpsutil.process.runtime.msd
index f0919e5f25b..392bfeec8f4 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/com.mbeddr.mpsutil.process.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/com.mbeddr.mpsutil.process.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.process.runtime" uuid="43934634-efb0-4f42-a10c-8d45587a1a5e" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.process.runtime" uuid="43934634-efb0-4f42-a10c-8d45587a1a5e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -21,14 +20,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/models/com/mbeddr/mpsutil/process/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/models/com/mbeddr/mpsutil/process/runtime/plugin.mps
index 1799cafdc8d..dabb7492788 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/models/com/mbeddr/mpsutil/process/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.runtime/models/com/mbeddr/mpsutil/process/runtime/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:e803c947-d318-4d4f-9c7f-255399e27699(com.mbeddr.mpsutil.process.runtime.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -43,7 +43,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -150,7 +150,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -179,7 +179,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -201,13 +201,14 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -237,7 +238,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -919,7 +919,7 @@
                         <node concept="1eOMI4" id="e7wQ4XEFi5" role="3clFbG">
                           <node concept="10QFUN" id="e7wQ4XEFi6" role="1eOMHV">
                             <node concept="37vLTw" id="e7wQ4XEFi4" role="10QFUP">
-                              <ref role="3cqZAo" node="e7wQ4XEEh_" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2J2" resolve="it" />
                             </node>
                             <node concept="3uibUv" id="e7wQ4XEFHf" role="10QFUM">
                               <ref role="3uigEE" to="uxeh:~AbstractWizardStepEx" resolve="AbstractWizardStepEx" />
@@ -928,9 +928,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="e7wQ4XEEh_" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2J2" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="e7wQ4XEEhA" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2J3" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -962,7 +962,7 @@
                       <node concept="3clFbF" id="44rcFjhXKAF" role="3cqZAp">
                         <node concept="2OqwBi" id="44rcFjhXKHA" role="3clFbG">
                           <node concept="37vLTw" id="44rcFjhXKAE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="44rcFjhXKqd" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2J4" resolve="it" />
                           </node>
                           <node concept="liA8E" id="44rcFjhXL6T" role="2OqNvi">
                             <ref role="37wK5l" node="44rcFjhSNRy" resolve="getExtensions" />
@@ -970,9 +970,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="44rcFjhXKqd" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2J4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="44rcFjhXKqe" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2J5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -984,7 +984,7 @@
                       <node concept="2OqwBi" id="e7wQ4XAv0a" role="3clFbG">
                         <node concept="2OqwBi" id="e7wQ4XAv0b" role="2Oq$k0">
                           <node concept="37vLTw" id="e7wQ4XAv0c" role="2Oq$k0">
-                            <ref role="3cqZAo" node="e7wQ4XAv0g" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2J6" resolve="it" />
                           </node>
                           <node concept="liA8E" id="e7wQ4XAv0d" role="2OqNvi">
                             <ref role="37wK5l" node="e7wQ4XAjLQ" resolve="forWizard" />
@@ -999,9 +999,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="e7wQ4XAv0g" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2J6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="e7wQ4XAv0h" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2J7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1133,7 +1133,7 @@
                         <node concept="1eOMI4" id="e7wQ4X_u5o" role="3clFbG">
                           <node concept="10QFUN" id="e7wQ4X_u5p" role="1eOMHV">
                             <node concept="37vLTw" id="e7wQ4X_u5n" role="10QFUP">
-                              <ref role="3cqZAo" node="e7wQ4X_tH1" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2J8" resolve="it" />
                             </node>
                             <node concept="3uibUv" id="e7wQ4X_uvU" role="10QFUM">
                               <ref role="3uigEE" node="5Kcl6zlCSj0" resolve="BaseProcessStep" />
@@ -1145,9 +1145,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="e7wQ4X_tH1" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2J8" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="e7wQ4X_tH2" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2J9" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1167,7 +1167,7 @@
                   <node concept="3clFbF" id="70BL6LoZUGn" role="3cqZAp">
                     <node concept="2OqwBi" id="70BL6LoZUMy" role="3clFbG">
                       <node concept="37vLTw" id="70BL6LoZUGm" role="2Oq$k0">
-                        <ref role="3cqZAo" node="70BL6LoZUBb" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Ja" resolve="it" />
                       </node>
                       <node concept="liA8E" id="70BL6LoZV$9" role="2OqNvi">
                         <ref role="37wK5l" node="70BL6LoTjIj" resolve="setWizard" />
@@ -1176,9 +1176,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="70BL6LoZUBb" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ja" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="70BL6LoZUBc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Jb" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1214,7 +1214,7 @@
                     <node concept="2OqwBi" id="5Kcl6zlF_mF" role="3clFbG">
                       <node concept="2OqwBi" id="5Kcl6zlF$k6" role="2Oq$k0">
                         <node concept="37vLTw" id="5Kcl6zlFyUS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5Kcl6zlFyO0" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Jc" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5Kcl6zlF_fW" role="2OqNvi">
                           <ref role="37wK5l" node="5Kcl6zlEDH0" resolve="getStepId" />
@@ -1229,9 +1229,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5Kcl6zlFyO0" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Jc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5Kcl6zlFyO1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Jd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1373,7 +1373,7 @@
                     <node concept="3clFbF" id="70BL6Lp0hpn" role="3cqZAp">
                       <node concept="2OqwBi" id="70BL6Lp0hpo" role="3clFbG">
                         <node concept="37vLTw" id="70BL6Lp0hpp" role="2Oq$k0">
-                          <ref role="3cqZAo" node="70BL6Lp0hpr" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Je" resolve="it" />
                         </node>
                         <node concept="liA8E" id="70BL6Lp0hpq" role="2OqNvi">
                           <ref role="37wK5l" node="7JKJHZ3RNn5" resolve="isApplicable" />
@@ -1381,9 +1381,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="70BL6Lp0hpr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Je" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="70BL6Lp0hps" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Jf" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1479,7 +1479,7 @@
                     <node concept="3clFbF" id="70BL6Lp0lek" role="3cqZAp">
                       <node concept="2OqwBi" id="70BL6Lp0lel" role="3clFbG">
                         <node concept="37vLTw" id="70BL6Lp0lem" role="2Oq$k0">
-                          <ref role="3cqZAo" node="70BL6Lp0leo" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Jg" resolve="it" />
                         </node>
                         <node concept="liA8E" id="70BL6Lp0len" role="2OqNvi">
                           <ref role="37wK5l" node="7JKJHZ3RNn5" resolve="isApplicable" />
@@ -1487,9 +1487,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="70BL6Lp0leo" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Jg" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="70BL6Lp0lep" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Jh" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2085,7 +2085,7 @@
                       <node concept="2OqwBi" id="e7wQ4XBSjy" role="3clFbG">
                         <node concept="2OqwBi" id="e7wQ4XBSjz" role="2Oq$k0">
                           <node concept="37vLTw" id="e7wQ4XBSj$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="e7wQ4XBSjE" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ji" resolve="it" />
                           </node>
                           <node concept="liA8E" id="e7wQ4XBSj_" role="2OqNvi">
                             <ref role="37wK5l" to="uxeh:~AbstractWizardStepEx.getStepId()" resolve="getStepId" />
@@ -2103,9 +2103,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="e7wQ4XBSjE" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Ji" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="e7wQ4XBSjF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Jj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2377,7 +2377,7 @@
                       <node concept="2OqwBi" id="e7wQ4XEVY_" role="3clFbG">
                         <node concept="2OqwBi" id="e7wQ4XEVYA" role="2Oq$k0">
                           <node concept="37vLTw" id="e7wQ4XEVYB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="e7wQ4XEVYH" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Jk" resolve="it" />
                           </node>
                           <node concept="liA8E" id="e7wQ4XEVYC" role="2OqNvi">
                             <ref role="37wK5l" to="uxeh:~AbstractWizardStepEx.getStepId()" resolve="getStepId" />
@@ -2395,9 +2395,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="e7wQ4XEVYH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Jk" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="e7wQ4XEVYI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Jl" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/com.mbeddr.mpsutil.process.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/com.mbeddr.mpsutil.process.sandbox.msd
index fb41d74db91..0c941402c6f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/com.mbeddr.mpsutil.process.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/com.mbeddr.mpsutil.process.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.process.sandbox" uuid="4df82fd0-088a-4158-85ec-920403c10e72" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.process.sandbox" uuid="4df82fd0-088a-4158-85ec-920403c10e72" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
@@ -19,10 +18,10 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps
index abc1f51f4eb..9a52017a030 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:9aef0d3c-87c9-4ce3-ad67-def9817c1ab4(com.mbeddr.mpsutil.process.sandbox.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="306d7456-29e2-4ea3-9c46-e7b830b08481" name="com.mbeddr.mpsutil.process" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -27,6 +27,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
         <property id="7458746815261976739" name="requiredAccess" index="2YLI8m" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
       </concept>
       <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
@@ -104,7 +105,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -175,7 +176,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -183,7 +184,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -200,6 +201,7 @@
     <property role="TrG5h" value="testAction" />
     <property role="2uzpH1" value="This is the Wizard Test" />
     <property role="2YLI8m" value="6u2MFnph2wS/none" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="70BL6LoVzwV" role="tncku">
       <node concept="3clFbS" id="70BL6LoVzwW" role="2VODD2">
         <node concept="1X3_iC" id="4O4MWU3UikM" role="lGtFl">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd
index 354fa5bd389..4dabeb56f63 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.review.runtime" uuid="bb6926d3-ebcc-4ca6-a3be-c618633c0dc1" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.review.runtime" uuid="bb6926d3-ebcc-4ca6-a3be-c618633c0dc1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -26,7 +25,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -44,7 +43,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime.mps
index 4b35d5bdb7e..535dd74cdc3 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime.mps
@@ -2,7 +2,7 @@
 <model ref="bb6926d3-ebcc-4ca6-a3be-c618633c0dc1/r:2b3b5f84-66ef-4014-bab0-8d3017aa7a4e(com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -25,7 +25,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -100,7 +100,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -125,13 +125,14 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -148,7 +149,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -317,16 +317,16 @@
                               </node>
                               <node concept="3JPx81" id="7lmVLrULCOP" role="2OqNvi">
                                 <node concept="37vLTw" id="7lmVLrULCOQ" role="25WWJ7">
-                                  <ref role="3cqZAo" node="7lmVLrULCOR" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Jm" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7lmVLrULCOR" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Jm" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7lmVLrULCOS" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Jn" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps
index 8db7ec1fa91..bf7be673ed3 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps
@@ -4,9 +4,9 @@
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
@@ -58,7 +58,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -174,7 +174,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -195,7 +195,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -210,6 +210,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -217,7 +218,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -268,7 +269,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -296,7 +297,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -1744,7 +1744,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="7lmVLrULGfZ" role="37wK5m">
                                     <node concept="37vLTw" id="7lmVLrULGg0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7lmVLrULGg8" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2Jo" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="7lmVLrULGg1" role="2OqNvi">
                                       <ref role="3TsBF5" to="elym:6YgBu0Al7fL" resolve="attachedCellId" />
@@ -1759,7 +1759,7 @@
                             <node concept="17R0WA" id="7lmVLrULGg3" role="3uHU7B">
                               <node concept="2OqwBi" id="7lmVLrULGg4" role="3uHU7B">
                                 <node concept="37vLTw" id="7lmVLrULGg5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7lmVLrULGg8" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Jo" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7lmVLrULGg6" role="2OqNvi">
                                   <ref role="3Tt5mk" to="elym:6YgBu0Alhax" resolve="attachedNode" />
@@ -1772,9 +1772,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7lmVLrULGg8" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Jo" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7lmVLrULGg9" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Jp" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1860,7 +1860,7 @@
                         </node>
                         <node concept="2OqwBi" id="7lmVLrULGgL" role="3uHU7B">
                           <node concept="37vLTw" id="7lmVLrULGgM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7lmVLrULGgT" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Jq" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="7lmVLrULGgN" role="2OqNvi">
                             <ref role="3TsBF5" to="elym:6YgBu0Al7fL" resolve="attachedCellId" />
@@ -1870,7 +1870,7 @@
                       <node concept="17R0WA" id="7lmVLrULGgO" role="3uHU7B">
                         <node concept="2OqwBi" id="7lmVLrULGgP" role="3uHU7B">
                           <node concept="37vLTw" id="7lmVLrULGgQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7lmVLrULGgT" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Jq" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7lmVLrULGgR" role="2OqNvi">
                             <ref role="3Tt5mk" to="elym:6YgBu0Alhax" resolve="attachedNode" />
@@ -1883,9 +1883,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7lmVLrULGgT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Jq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7lmVLrULGgU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Jr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1930,7 +1930,7 @@
                             <ref role="3cqZAo" node="3cilTABRoE9" resolve="editorComponent" />
                           </node>
                           <node concept="37vLTw" id="7lmVLrULGhk" role="37wK5m">
-                            <ref role="3cqZAo" node="7lmVLrULGhq" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Js" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -1941,7 +1941,7 @@
                       </node>
                       <node concept="2OqwBi" id="7lmVLrULGhn" role="3uHU7B">
                         <node concept="37vLTw" id="7lmVLrULGho" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7lmVLrULGhq" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Js" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="7lmVLrULGhp" role="2OqNvi">
                           <ref role="3Tt5mk" to="7krq:10nVqVfzJLq" resolve="repliedNote" />
@@ -1950,9 +1950,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7lmVLrULGhq" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Js" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7lmVLrULGhr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Jt" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/com.mbeddr.mpsutil.review.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/com.mbeddr.mpsutil.review.sandbox.msd
index af139bcf953..0abcf626b92 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/com.mbeddr.mpsutil.review.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/com.mbeddr.mpsutil.review.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.review.sandbox" uuid="8e0adbed-6d43-435c-a42b-c9029503826b" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.review.sandbox" uuid="8e0adbed-6d43-435c-a42b-c9029503826b" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
     <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/com.mbeddr.mpsutil.richstring.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/com.mbeddr.mpsutil.richstring.sandbox.msd
index ad3a7bddb7f..2d3c6b32b6e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/com.mbeddr.mpsutil.richstring.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/com.mbeddr.mpsutil.richstring.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.richstring.sandbox" uuid="10d128c8-0b0f-41a7-b9f3-fc3eac840ee5" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.richstring.sandbox" uuid="10d128c8-0b0f-41a7-b9f3-fc3eac840ee5" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/models/com/mbeddr/mpsutil/richstring/sandbox.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/models/com/mbeddr/mpsutil/richstring/sandbox.mps
index 7a480e61703..9fdacbedb48 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/models/com/mbeddr/mpsutil/richstring/sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.richstring.sandbox/models/com/mbeddr/mpsutil/richstring/sandbox.mps
@@ -68,7 +68,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,7 +79,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -116,7 +116,7 @@
       <concept id="3354025285337290501" name="com.mbeddr.mpsutil.richstring.structure.InlineVariableReference" flags="ng" index="EJJcZ" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/com.mbeddr.mpsutil.smodule.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/com.mbeddr.mpsutil.smodule.runtime.msd
index bac668ed1e2..5f5d1394bb4 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/com.mbeddr.mpsutil.smodule.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/com.mbeddr.mpsutil.smodule.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.smodule.runtime" uuid="d7931714-a11c-4108-aa0e-246d86070dad" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.smodule.runtime" uuid="d7931714-a11c-4108-aa0e-246d86070dad" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -19,7 +18,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -42,7 +41,6 @@
     <module reference="d7931714-a11c-4108-aa0e-246d86070dad(com.mbeddr.mpsutil.smodule.runtime)" version="0" />
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/models/com/mbeddr/mpsutil/smodule/runtime/lib.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/models/com/mbeddr/mpsutil/smodule/runtime/lib.mps
index b46dab230bf..579de2b0a80 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/models/com/mbeddr/mpsutil/smodule/runtime/lib.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.runtime/models/com/mbeddr/mpsutil/smodule/runtime/lib.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -45,7 +45,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -93,7 +93,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -152,7 +152,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -180,7 +180,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -211,6 +211,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -249,7 +250,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -279,7 +280,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
@@ -616,7 +616,7 @@
                         <node concept="3clFbF" id="7raGfT8P8g6" role="3cqZAp">
                           <node concept="2OqwBi" id="7raGfT8P8tm" role="3clFbG">
                             <node concept="37vLTw" id="7raGfT8P8g5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7raGfT8P7V$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ju" resolve="it" />
                             </node>
                             <node concept="liA8E" id="7raGfT8P8Jg" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SLanguage.getSourceModuleReference()" resolve="getSourceModuleReference" />
@@ -624,9 +624,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7raGfT8P7V$" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ju" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7raGfT8P7V_" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Jv" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -639,7 +639,7 @@
                     <node concept="3clFbF" id="fXun2Rl_$a" role="3cqZAp">
                       <node concept="2OqwBi" id="7raGfT8P5R2" role="3clFbG">
                         <node concept="37vLTw" id="7raGfT8PcQt" role="2Oq$k0">
-                          <ref role="3cqZAo" node="fXun2Rl_lC" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Jw" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7raGfT8P67x" role="2OqNvi">
                           <ref role="37wK5l" to="lui2:~SModuleReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -655,9 +655,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="fXun2Rl_lC" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Jw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="fXun2Rl_lD" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Jx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd
index f6e4ed02288..7e50f4600fb 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.smodule.sandbox" uuid="75421745-8578-4934-8542-28c0254468e8" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.smodule.sandbox" uuid="75421745-8578-4934-8542-28c0254468e8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -21,13 +20,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpdutil/smodule/sandbox/box.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpdutil/smodule/sandbox/box.mps
index b3b3f81e0af..144493478ee 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpdutil/smodule/sandbox/box.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpdutil/smodule/sandbox/box.mps
@@ -60,7 +60,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -75,7 +75,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps
index 9dd030eccf5..d1ec25672a3 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:7c74ea14-a042-4e84-9000-68e17f86cdb8(com.mbeddr.mpsutil.smodule.sandbox.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="3eada220-3310-4fd3-b794-ff924add7d8a" name="com.mbeddr.mpsutil.smodule" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
@@ -19,6 +19,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -38,7 +39,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -62,7 +63,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -72,7 +73,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -90,6 +91,7 @@
   <node concept="sE7Ow" id="7Ynnt_OeSdG">
     <property role="TrG5h" value="lalla" />
     <property role="2uzpH1" value="add devkit" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="7Ynnt_OeWdW" role="1NuT2Z">
       <property role="TrG5h" value="model" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODEL" resolve="MODEL" />
@@ -133,6 +135,7 @@
   <node concept="sE7Ow" id="7Ynnt_OfT3m">
     <property role="TrG5h" value="lala2" />
     <property role="2uzpH1" value="add lang" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="7Ynnt_OfT43" role="1NuT2Z">
       <property role="TrG5h" value="modl" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODEL" resolve="MODEL" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/com.mbeddr.mpsutil.spreferences.demoplugin.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/com.mbeddr.mpsutil.spreferences.demoplugin.msd
index 0a4e478c3b6..fa5ef7206ca 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/com.mbeddr.mpsutil.spreferences.demoplugin.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/com.mbeddr.mpsutil.spreferences.demoplugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.spreferences.demoplugin" uuid="5e8c2b8b-c05d-4e46-addb-28a5c6876c4c" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.spreferences.demoplugin" uuid="5e8c2b8b-c05d-4e46-addb-28a5c6876c4c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
@@ -18,7 +17,7 @@
     <language slang="l:c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1:com.mbeddr.mpsutil.spreferences" 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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/models/com/mbeddr/mpsutil/spreferences/demoplugin/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/models/com/mbeddr/mpsutil/spreferences/demoplugin/plugin.mps
index 319474c4ae9..f272c1a6c0b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/models/com/mbeddr/mpsutil/spreferences/demoplugin/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.demoplugin/models/com/mbeddr/mpsutil/spreferences/demoplugin/plugin.mps
@@ -69,7 +69,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/com.mbeddr.mpsutil.spreferences.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/com.mbeddr.mpsutil.spreferences.runtime.msd
index b310ea9be5b..5b93f35309c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/com.mbeddr.mpsutil.spreferences.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/com.mbeddr.mpsutil.spreferences.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.spreferences.runtime" uuid="e78f91af-08a8-4a7a-bed6-b22739ed069a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.spreferences.runtime" uuid="e78f91af-08a8-4a7a-bed6-b22739ed069a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -28,7 +27,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/models/com/mbeddr/mpsutil/spreferences/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/models/com/mbeddr/mpsutil/spreferences/runtime.mps
index 4f4e2409719..2269d6ac17a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/models/com/mbeddr/mpsutil/spreferences/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.spreferences.runtime/models/com/mbeddr/mpsutil/spreferences/runtime.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -41,7 +41,6 @@
     <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="qxsb" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.options.ex(MPS.IDEA/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="pa15" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.persistence(MPS.Core/)" />
     <import index="xj2j" ref="86441d7a-e194-42da-81a5-2161ec62a379/java:jetbrains.mps.plugins.projectplugins(MPS.Workbench/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
@@ -64,8 +63,8 @@
     <import index="9ti4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.extensions(MPS.IDEA/)" />
     <import index="cttk" ref="r:5ff047e0-2953-4750-806a-bdc16824aa89(jetbrains.mps.smodel)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
-    <import index="wvnl" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.extensions(MPS.Editor/)" />
     <import index="mmaq" ref="f647e48e-4568-4f4c-b48a-1546492c6a2e/java:org.jdom(org.jdom/)" />
+    <import index="wvnl" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.extensions(MPS.Editor/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" implicit="true" />
     <import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" implicit="true" />
   </imports>
@@ -106,7 +105,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -224,7 +223,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -255,7 +254,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -301,6 +300,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -322,6 +322,13 @@
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261755" name="throwable" index="RRSow" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -344,7 +351,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -371,7 +378,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -3032,7 +3038,7 @@
                         <node concept="2OqwBi" id="2Wc_BLzaf23" role="3uHU7B">
                           <node concept="2OqwBi" id="Nmj9rdB1jE" role="2Oq$k0">
                             <node concept="37vLTw" id="Nmj9rdB1jF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="Nmj9rdB1jH" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Jy" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2Wc_BLzaewy" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
@@ -3045,9 +3051,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Nmj9rdB1jH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Jy" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Nmj9rdB1jI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Jz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3325,21 +3331,10 @@
           </node>
           <node concept="9aQIb" id="10o6Xu8YP$5" role="9aQIa">
             <node concept="3clFbS" id="10o6Xu8YP$6" role="9aQI4">
-              <node concept="3clFbF" id="10o6Xu94wPs" role="3cqZAp">
-                <node concept="2OqwBi" id="10o6Xu94$sq" role="3clFbG">
-                  <node concept="2YIFZM" id="10o6Xu94x9T" role="2Oq$k0">
-                    <ref role="37wK5l" to="q7tw:~Category.getInstance(java.lang.Class)" resolve="getInstance" />
-                    <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-                    <node concept="3VsKOn" id="10o6Xu94yOK" role="37wK5m">
-                      <ref role="3VsUkX" node="365LVGC64z0" resolve="PreferenceModules" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="10o6Xu94A55" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object)" resolve="error" />
-                    <node concept="Xl_RD" id="10o6Xu94Ai2" role="37wK5m">
-                      <property role="Xl_RC" value="Depecated code in PreferenceModules, please refactor" />
-                    </node>
-                  </node>
+              <node concept="RRSsy" id="1Ch_cEfHoaK" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fh_4/error" />
+                <node concept="Xl_RD" id="10o6Xu94Ai2" role="RRSoy">
+                  <property role="Xl_RC" value="Deprecated code in PreferenceModules, please refactor" />
                 </node>
               </node>
               <node concept="3clFbF" id="10o6Xu8Yw1i" role="3cqZAp">
@@ -3370,12 +3365,12 @@
               <node concept="3cpWsn" id="2amrMVodfHx" role="3cpWs9">
                 <property role="TrG5h" value="project" />
                 <node concept="3uibUv" id="2amrMVodfHt" role="1tU5fm">
-                  <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+                  <ref role="3uigEE" to="z1c5:~MPSProject" resolve="MPSProject" />
                 </node>
                 <node concept="1eOMI4" id="2amrMVodfHy" role="33vP2m">
                   <node concept="10QFUN" id="2amrMVodfHz" role="1eOMHV">
                     <node concept="3uibUv" id="2amrMVodfH$" role="10QFUM">
-                      <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+                      <ref role="3uigEE" to="z1c5:~MPSProject" resolve="MPSProject" />
                     </node>
                     <node concept="37vLTw" id="2amrMVodfH_" role="10QFUP">
                       <ref role="3cqZAo" node="MCpgxY92ym" resolve="moduleOwner" />
@@ -3392,7 +3387,7 @@
                       <ref role="3cqZAo" node="2amrMVodfHx" resolve="project" />
                     </node>
                     <node concept="liA8E" id="YmESZLfvA" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~IProject.addModule(org.jetbrains.mps.openapi.module.SModule)" resolve="addModule" />
+                      <ref role="37wK5l" to="z1c3:~ProjectBase.addModule(org.jetbrains.mps.openapi.module.SModule)" resolve="addModule" />
                       <node concept="37vLTw" id="YmESZLfEb" role="37wK5m">
                         <ref role="3cqZAo" node="YmESZLci$" resolve="solution" />
                       </node>
@@ -3412,79 +3407,53 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="2amrMVodfAC" role="3cqZAp">
-              <node concept="3clFbS" id="2amrMVodfAE" role="3clFbx">
-                <node concept="3cpWs8" id="41joaxK32sK" role="3cqZAp">
-                  <node concept="3cpWsn" id="41joaxK32sL" role="3cpWs9">
-                    <property role="TrG5h" value="currentFolderName" />
-                    <node concept="17QB3L" id="41joaxK32FH" role="1tU5fm" />
-                    <node concept="2OqwBi" id="41joaxK32sM" role="33vP2m">
-                      <node concept="1eOMI4" id="41joaxK32sN" role="2Oq$k0">
-                        <node concept="10QFUN" id="41joaxK32sO" role="1eOMHV">
-                          <node concept="3uibUv" id="41joaxK32sP" role="10QFUM">
-                            <ref role="3uigEE" to="z1c4:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
-                          </node>
-                          <node concept="37vLTw" id="41joaxK32sQ" role="10QFUP">
-                            <ref role="3cqZAo" node="2amrMVodfHx" resolve="project" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="41joaxK32sR" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c4:~StandaloneMPSProject.getFolderFor(org.jetbrains.mps.openapi.module.SModule)" resolve="getFolderFor" />
-                        <node concept="37vLTw" id="41joaxK32sS" role="37wK5m">
-                          <ref role="3cqZAo" node="YmESZLci$" resolve="solution" />
-                        </node>
-                      </node>
+            <node concept="3cpWs8" id="41joaxK32sK" role="3cqZAp">
+              <node concept="3cpWsn" id="41joaxK32sL" role="3cpWs9">
+                <property role="TrG5h" value="currentFolderName" />
+                <node concept="17QB3L" id="41joaxK32FH" role="1tU5fm" />
+                <node concept="2OqwBi" id="41joaxK32sM" role="33vP2m">
+                  <node concept="37vLTw" id="41joaxK32sQ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2amrMVodfHx" resolve="project" />
+                  </node>
+                  <node concept="liA8E" id="41joaxK32sR" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c3:~ProjectBase.getVirtualFolder(org.jetbrains.mps.openapi.module.SModule)" resolve="getVirtualFolder" />
+                    <node concept="37vLTw" id="41joaxK32sS" role="37wK5m">
+                      <ref role="3cqZAo" node="YmESZLci$" resolve="solution" />
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="41joaxK32ZH" role="3cqZAp">
-                  <node concept="3clFbS" id="41joaxK32ZJ" role="3clFbx">
-                    <node concept="3clFbF" id="2amrMVodhI4" role="3cqZAp">
-                      <node concept="2OqwBi" id="2amrMVodi0e" role="3clFbG">
-                        <node concept="1eOMI4" id="2amrMVodhI1" role="2Oq$k0">
-                          <node concept="10QFUN" id="2amrMVodhHY" role="1eOMHV">
-                            <node concept="3uibUv" id="2amrMVodhI3" role="10QFUM">
-                              <ref role="3uigEE" to="z1c4:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
-                            </node>
-                            <node concept="37vLTw" id="2amrMVodhUD" role="10QFUP">
-                              <ref role="3cqZAo" node="2amrMVodfHx" resolve="project" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="2amrMVodi_3" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c4:~StandaloneMPSProject.setFolderFor(org.jetbrains.mps.openapi.module.SModule,java.lang.String)" resolve="setFolderFor" />
-                          <node concept="37vLTw" id="2amrMVodiKa" role="37wK5m">
-                            <ref role="3cqZAo" node="YmESZLci$" resolve="solution" />
-                          </node>
-                          <node concept="Xl_RD" id="2amrMVodiRQ" role="37wK5m">
-                            <property role="Xl_RC" value="_spreferences" />
-                          </node>
-                        </node>
-                      </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="41joaxK32ZH" role="3cqZAp">
+              <node concept="3clFbS" id="41joaxK32ZJ" role="3clFbx">
+                <node concept="3clFbF" id="2amrMVodhI4" role="3cqZAp">
+                  <node concept="2OqwBi" id="2amrMVodi0e" role="3clFbG">
+                    <node concept="37vLTw" id="2amrMVodhUD" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2amrMVodfHx" resolve="project" />
                     </node>
-                  </node>
-                  <node concept="2OqwBi" id="41joaxK37Ge" role="3clFbw">
-                    <node concept="37vLTw" id="41joaxK33e0" role="2Oq$k0">
-                      <ref role="3cqZAo" node="41joaxK32sL" resolve="currentFolderName" />
+                    <node concept="liA8E" id="2amrMVodi_3" role="2OqNvi">
+                      <ref role="37wK5l" to="z1c3:~ProjectBase.setVirtualFolder(org.jetbrains.mps.openapi.module.SModule,java.lang.String)" resolve="setVirtualFolder" />
+                      <node concept="37vLTw" id="2amrMVodiKa" role="37wK5m">
+                        <ref role="3cqZAo" node="YmESZLci$" resolve="solution" />
+                      </node>
+                      <node concept="Xl_RD" id="2amrMVodiRQ" role="37wK5m">
+                        <property role="Xl_RC" value="_spreferences" />
+                      </node>
                     </node>
-                    <node concept="17RlXB" id="41joaxK37So" role="2OqNvi" />
                   </node>
                 </node>
               </node>
-              <node concept="2ZW3vV" id="2amrMVodg6S" role="3clFbw">
-                <node concept="3uibUv" id="2amrMVodgic" role="2ZW6by">
-                  <ref role="3uigEE" to="z1c4:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
-                </node>
-                <node concept="37vLTw" id="2amrMVodfUZ" role="2ZW6bz">
-                  <ref role="3cqZAo" node="2amrMVodfHx" resolve="project" />
+              <node concept="2OqwBi" id="41joaxK37Ge" role="3clFbw">
+                <node concept="37vLTw" id="41joaxK33e0" role="2Oq$k0">
+                  <ref role="3cqZAo" node="41joaxK32sL" resolve="currentFolderName" />
                 </node>
+                <node concept="17RlXB" id="41joaxK37So" role="2OqNvi" />
               </node>
             </node>
           </node>
           <node concept="2ZW3vV" id="YmESZLdOg" role="3clFbw">
             <node concept="3uibUv" id="YmESZLdWh" role="2ZW6by">
-              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+              <ref role="3uigEE" to="z1c5:~MPSProject" resolve="MPSProject" />
             </node>
             <node concept="37vLTw" id="YmESZLdBA" role="2ZW6bz">
               <ref role="3cqZAo" node="MCpgxY92ym" resolve="moduleOwner" />
@@ -3508,43 +3477,19 @@
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="2uT2PLn4Dmw" role="3clF47">
-        <node concept="2Gpval" id="2uT2PLn4G4w" role="3cqZAp">
-          <node concept="2GrKxI" id="2uT2PLn4G4y" role="2Gsz3X">
-            <property role="TrG5h" value="projectModule" />
-          </node>
-          <node concept="3clFbS" id="2uT2PLn4G4$" role="2LFqv$">
-            <node concept="3clFbJ" id="2uT2PLn4GC0" role="3cqZAp">
-              <node concept="3clFbS" id="2uT2PLn4GC1" role="3clFbx">
-                <node concept="3cpWs6" id="2uT2PLn4Hhy" role="3cqZAp">
-                  <node concept="3clFbT" id="2uT2PLn4HmP" role="3cqZAk">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-              <node concept="17R0WA" id="2uT2PLn4GT_" role="3clFbw">
-                <node concept="37vLTw" id="2uT2PLn4H62" role="3uHU7w">
-                  <ref role="3cqZAo" node="2uT2PLn4Ezf" resolve="module" />
-                </node>
-                <node concept="2GrUjf" id="2uT2PLn4GMy" role="3uHU7B">
-                  <ref role="2Gs0qQ" node="2uT2PLn4G4y" resolve="projectModule" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="2uT2PLn4Gon" role="2GsD0m">
-            <node concept="37vLTw" id="2uT2PLn4Gi6" role="2Oq$k0">
+        <node concept="3cpWs6" id="2uT2PLn4I2P" role="3cqZAp">
+          <node concept="2OqwBi" id="2x4nHT4sG41" role="3cqZAk">
+            <node concept="37vLTw" id="2x4nHT4sF4G" role="2Oq$k0">
               <ref role="3cqZAo" node="2uT2PLn4Eox" resolve="project" />
             </node>
-            <node concept="liA8E" id="2uT2PLn4Gtj" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~IProject.getProjectModules()" resolve="getProjectModules" />
+            <node concept="liA8E" id="2x4nHT4sIjk" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.isProjectModule(org.jetbrains.mps.openapi.module.SModule)" resolve="isProjectModule" />
+              <node concept="37vLTw" id="2x4nHT4sKun" role="37wK5m">
+                <ref role="3cqZAo" node="2uT2PLn4Ezf" resolve="module" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="2uT2PLn4I2P" role="3cqZAp">
-          <node concept="3clFbT" id="2uT2PLn4I8I" role="3cqZAk">
-            <property role="3clFbU" value="false" />
-          </node>
-        </node>
       </node>
       <node concept="37vLTG" id="2uT2PLn4Eox" role="3clF46">
         <property role="TrG5h" value="project" />
@@ -4874,21 +4819,6 @@
   </node>
   <node concept="312cEu" id="5aAhNV43q1">
     <property role="TrG5h" value="SPreferencesPanel" />
-    <node concept="312cEg" id="4_SU66w0A5X" role="jymVt">
-      <property role="TrG5h" value="LOG" />
-      <node concept="3Tm6S6" id="4_SU66w0A5Y" role="1B3o_S" />
-      <node concept="3uibUv" id="4_SU66w2ob3" role="1tU5fm">
-        <ref role="3uigEE" to="q7tw:~Logger" resolve="Logger" />
-      </node>
-      <node concept="2YIFZM" id="4_SU66w2oxb" role="33vP2m">
-        <ref role="37wK5l" to="q7tw:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
-        <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-        <node concept="3VsKOn" id="4_SU66w2p2M" role="37wK5m">
-          <ref role="3VsUkX" node="5aAhNV43q1" resolve="SPreferencesPanel" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4_SU66w0kqH" role="jymVt" />
     <node concept="312cEg" id="4RbRvogcSVg" role="jymVt">
       <property role="TrG5h" value="myProject" />
       <node concept="3uibUv" id="1n7YT7NSmt9" role="1tU5fm">
@@ -5438,26 +5368,19 @@
               </node>
             </node>
             <node concept="3clFbS" id="4RbRvogeB3_" role="1zc67A">
-              <node concept="3clFbF" id="4_SU66w2_s6" role="3cqZAp">
-                <node concept="2OqwBi" id="4_SU66w2_up" role="3clFbG">
-                  <node concept="37vLTw" id="4_SU66w2_s5" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4_SU66w0A5X" resolve="LOG" />
-                  </node>
-                  <node concept="liA8E" id="4_SU66w2_E_" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="2OqwBi" id="2Wc_BLz2spE" role="37wK5m">
-                      <node concept="37vLTw" id="2Wc_BLz2sf7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4RbRvogeB3x" resolve="t" />
-                      </node>
-                      <node concept="liA8E" id="2Wc_BLz2sKc" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="4_SU66w2_R7" role="37wK5m">
-                      <ref role="3cqZAo" node="4RbRvogeB3x" resolve="t" />
-                    </node>
+              <node concept="RRSsy" id="1Ch_cEfHJiG" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fh_4/error" />
+                <node concept="2OqwBi" id="2Wc_BLz2spE" role="RRSoy">
+                  <node concept="37vLTw" id="2Wc_BLz2sf7" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4RbRvogeB3x" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="2Wc_BLz2sKc" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="1Ch_cEfHQ27" role="RRSow">
+                  <ref role="3cqZAo" node="4RbRvogeB3x" resolve="t" />
+                </node>
               </node>
             </node>
           </node>
@@ -5596,25 +5519,18 @@
               </node>
             </node>
             <node concept="3clFbS" id="4RbRvogcqYg" role="1zc67A">
-              <node concept="3clFbF" id="4_SU66w2A1E" role="3cqZAp">
-                <node concept="2OqwBi" id="4_SU66w2A3X" role="3clFbG">
-                  <node concept="37vLTw" id="4_SU66w2A1D" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4_SU66w0A5X" resolve="LOG" />
-                  </node>
-                  <node concept="liA8E" id="4_SU66w2Ag9" role="2OqNvi">
-                    <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object,java.lang.Throwable)" resolve="error" />
-                    <node concept="2OqwBi" id="2Wc_BLz2sPy" role="37wK5m">
-                      <node concept="37vLTw" id="2Wc_BLz2sPz" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4RbRvogcqYc" resolve="t" />
-                      </node>
-                      <node concept="liA8E" id="2Wc_BLz2sP$" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="4_SU66w2Axv" role="37wK5m">
-                      <ref role="3cqZAo" node="4RbRvogcqYc" resolve="t" />
-                    </node>
+              <node concept="RRSsy" id="1Ch_cEfHYBR" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fh_4/error" />
+                <node concept="2OqwBi" id="1Ch_cEfI4Pj" role="RRSoy">
+                  <node concept="37vLTw" id="1Ch_cEfI3iH" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4RbRvogcqYc" resolve="t" />
                   </node>
+                  <node concept="liA8E" id="1Ch_cEfI6Sn" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="1Ch_cEfI9qN" role="RRSow">
+                  <ref role="3cqZAo" node="4RbRvogcqYc" resolve="t" />
                 </node>
               </node>
             </node>
@@ -7265,10 +7181,10 @@
             <node concept="3uibUv" id="2PFG8EifXwW" role="1tU5fm">
               <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
             </node>
-            <node concept="2YIFZM" id="2PFG8EifXx0" role="33vP2m">
+            <node concept="2YIFZM" id="2x4nHT4shGN" role="33vP2m">
+              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
               <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <ref role="37wK5l" to="alof:~ProjectHelper.toMPSProject(com.intellij.openapi.project.Project)" resolve="toMPSProject" />
-              <node concept="1rXfSq" id="2PFG8EifXx1" role="37wK5m">
+              <node concept="1rXfSq" id="2x4nHT4shGO" role="37wK5m">
                 <ref role="37wK5l" to="sclo:~BaseProjectPrefsComponent.getProject()" resolve="getProject" />
               </node>
             </node>
@@ -7355,6 +7271,84 @@
           </node>
         </node>
         <node concept="3clFbH" id="2PFG8Eigc9i" role="3cqZAp" />
+        <node concept="3SKdUt" id="2x4nHT4s8WS" role="3cqZAp">
+          <node concept="1PaTwC" id="2x4nHT4s8WT" role="1aUNEU">
+            <node concept="3oM_SD" id="2x4nHT4s8XP" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4s9ze" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4s9zh" role="1PaTwD">
+              <property role="3oM_SC" value="consider" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4s9_E" role="1PaTwD">
+              <property role="3oM_SC" value="using" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4s9Fu" role="1PaTwD">
+              <property role="3oM_SC" value="finders," />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4saO2" role="1PaTwD">
+              <property role="3oM_SC" value="e.g." />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2x4nHT4s9KG" role="3cqZAp">
+          <node concept="1PaTwC" id="2x4nHT4s9K_" role="1aUNEU">
+            <node concept="3oM_SD" id="2x4nHT4s9K$" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4saNl" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4saNp" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4saNH" role="1PaTwD">
+              <property role="3oM_SC" value="FindUtils.makeProvider(LanguageModelImportFinder).findResults(GenericHolder(rootConceptLanguage))" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2x4nHT4sbCF" role="3cqZAp">
+          <node concept="1PaTwC" id="2x4nHT4sbCG" role="1aUNEU">
+            <node concept="3oM_SD" id="2x4nHT4sc8A" role="1PaTwD">
+              <property role="3oM_SC" value=" " />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4sc8C" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4sc8G" role="1PaTwD">
+              <property role="3oM_SC" value="there's" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scaP" role="1PaTwD">
+              <property role="3oM_SC" value="also" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scb0" role="1PaTwD">
+              <property role="3oM_SC" value="LanguageUsagesFinder" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scb6" role="1PaTwD">
+              <property role="3oM_SC" value="that" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scbd" role="1PaTwD">
+              <property role="3oM_SC" value="finds" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scbl" role="1PaTwD">
+              <property role="3oM_SC" value="actual" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scbN" role="1PaTwD">
+              <property role="3oM_SC" value="uses" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scbX" role="1PaTwD">
+              <property role="3oM_SC" value="instead" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scc8" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="2x4nHT4scck" role="1PaTwD">
+              <property role="3oM_SC" value="imports" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="4f7KQhrK0iM" role="3cqZAp">
           <node concept="3cpWsn" id="4f7KQhrK0iN" role="3cpWs9">
             <property role="TrG5h" value="result" />
@@ -7437,12 +7431,17 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="4oyZYg9z$1W" role="2GsD0m">
-                      <node concept="37vLTw" id="2PFG8Eig4KB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2PFG8Eig1yI" resolve="project" />
+                    <node concept="2OqwBi" id="2x4nHT4sgkk" role="2GsD0m">
+                      <node concept="2OqwBi" id="4oyZYg9z$1W" role="2Oq$k0">
+                        <node concept="37vLTw" id="2PFG8Eig4KB" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2PFG8Eig1yI" resolve="project" />
+                        </node>
+                        <node concept="liA8E" id="2x4nHT4sf6t" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
+                        </node>
                       </node>
-                      <node concept="liA8E" id="4oyZYg9z$1Y" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getProjectModels()" resolve="getProjectModels" />
+                      <node concept="liA8E" id="2x4nHT4sh6h" role="2OqNvi">
+                        <ref role="37wK5l" to="w1kc:~BaseScope.getModels()" resolve="getModels" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd
index 26db9028664..0e06ab6895c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.targetchooser" uuid="e1808c0b-7a09-4f46-9950-17a7f0b53c29" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.targetchooser" uuid="e1808c0b-7a09-4f46-9950-17a7f0b53c29" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
     <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -55,7 +54,6 @@
     <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="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/models/com/mbeddr/mpsutil/targetchooser.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/models/com/mbeddr/mpsutil/targetchooser.mps
index beccf720a05..c240647982b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/models/com/mbeddr/mpsutil/targetchooser.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/models/com/mbeddr/mpsutil/targetchooser.mps
@@ -35,7 +35,6 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" />
     <import index="vqh0" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.make(MPS.Core/)" />
-    <import index="rqo8" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project.structure(MPS.Core/)" />
     <import index="fyhk" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps(MPS.Platform/)" />
     <import index="65en" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.speedSearch(MPS.IDEA/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
@@ -87,7 +86,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -233,7 +232,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -268,7 +267,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -319,6 +318,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -368,7 +368,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -418,7 +418,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240217271293" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashSetCreator" flags="nn" index="32HrFt" />
@@ -2644,7 +2643,7 @@
         <property role="TrG5h" value="myProject" />
         <property role="3TUv4t" value="false" />
         <node concept="3uibUv" id="2Nt6pro8c4a" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
+          <ref role="3uigEE" to="z1c5:~MPSProject" resolve="MPSProject" />
         </node>
         <node concept="3Tm6S6" id="2Nt6pro8c4b" role="1B3o_S" />
       </node>
@@ -2670,7 +2669,7 @@
                   <ref role="3cqZAo" node="2Nt6pro8c4e" resolve="project" />
                 </node>
                 <node concept="3uibUv" id="2Nt6pro8c4m" role="10QFUM">
-                  <ref role="3uigEE" to="z1c4:~StandaloneMPSProject" resolve="StandaloneMPSProject" />
+                  <ref role="3uigEE" to="z1c5:~MPSProject" resolve="MPSProject" />
                 </node>
               </node>
             </node>
@@ -2740,7 +2739,7 @@
                       <ref role="3cqZAo" node="2Nt6pro8c48" resolve="myProject" />
                     </node>
                     <node concept="liA8E" id="2Nt6pro8c5x" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c4:~StandaloneMPSProject.getFolderFor(org.jetbrains.mps.openapi.module.SModule)" resolve="getFolderFor" />
+                      <ref role="37wK5l" to="z1c3:~ProjectBase.getVirtualFolder(org.jetbrains.mps.openapi.module.SModule)" resolve="getVirtualFolder" />
                       <node concept="2OqwBi" id="2Nt6pro8c63" role="37wK5m">
                         <node concept="37vLTw" id="2Nt6pro8c62" role="2Oq$k0">
                           <ref role="3cqZAo" node="2Nt6pro8c4B" resolve="pmtn" />
@@ -9612,15 +9611,15 @@
                       <node concept="liA8E" id="6yXTMcU4GLb" role="2OqNvi">
                         <ref role="37wK5l" node="6yXTMcU4BPk" resolve="keep" />
                         <node concept="37vLTw" id="6yXTMcU4GPY" role="37wK5m">
-                          <ref role="3cqZAo" node="6yXTMcU4FFm" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2J$" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6yXTMcU4FFm" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2J$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6yXTMcU4FFn" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2J_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9748,15 +9747,15 @@
                         <node concept="liA8E" id="6yXTMcU9kx4" role="2OqNvi">
                           <ref role="37wK5l" node="6yXTMcUaXPX" resolve="showModel" />
                           <node concept="37vLTw" id="6yXTMcU9kCU" role="37wK5m">
-                            <ref role="3cqZAo" node="6yXTMcU9jvF" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2JA" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6yXTMcU9jvF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2JA" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6yXTMcU9jvG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2JB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10027,15 +10026,15 @@
                         <node concept="3clFbF" id="6yXTMcUbJB9" role="3cqZAp">
                           <node concept="2OqwBi" id="6yXTMcUbJJT" role="3clFbG">
                             <node concept="37vLTw" id="6yXTMcUbJB8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6yXTMcUbJtt" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2JC" resolve="it" />
                             </node>
                             <node concept="2Rxl7S" id="6yXTMcUbK7g" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6yXTMcUbJtt" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2JC" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6yXTMcUbJtu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2JD" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -10062,15 +10061,15 @@
                         <node concept="3clFbF" id="6yXTMcUboMS" role="3cqZAp">
                           <node concept="2OqwBi" id="6yXTMcUboSc" role="3clFbG">
                             <node concept="37vLTw" id="6yXTMcUboMR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6yXTMcUboE$" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2JE" resolve="it" />
                             </node>
                             <node concept="I4A8Y" id="6yXTMcUbp5z" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6yXTMcUboE$" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2JE" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6yXTMcUboE_" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2JF" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -10100,7 +10099,7 @@
                           <node concept="2OqwBi" id="6yXTMcUbsRz" role="3clFbG">
                             <node concept="2JrnkZ" id="6yXTMcUbsIm" role="2Oq$k0">
                               <node concept="37vLTw" id="6yXTMcUbrT6" role="2JrQYb">
-                                <ref role="3cqZAo" node="6yXTMcUbrJ5" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2JG" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="6yXTMcUbtuv" role="2OqNvi">
@@ -10109,9 +10108,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6yXTMcUbrJ5" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2JG" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6yXTMcUbrJ6" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2JH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -10140,15 +10139,15 @@
                             <node concept="3clFbF" id="6yXTMcUha4s" role="3cqZAp">
                               <node concept="2OqwBi" id="6yXTMcUhaaX" role="3clFbG">
                                 <node concept="37vLTw" id="6yXTMcUha4r" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6yXTMcUh9Uo" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2JI" resolve="it" />
                                 </node>
                                 <node concept="z$bX8" id="6yXTMcUhaCC" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6yXTMcUh9Uo" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2JI" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6yXTMcUh9Up" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2JJ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -10285,15 +10284,15 @@
                       </node>
                       <node concept="3JPx81" id="6yXTMcUbOZ_" role="2OqNvi">
                         <node concept="37vLTw" id="6yXTMcUbP4A" role="25WWJ7">
-                          <ref role="3cqZAo" node="6yXTMcUbNi2" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2JK" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6yXTMcUbNi2" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2JK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6yXTMcUbNi3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2JL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10651,15 +10650,15 @@
                       <node concept="liA8E" id="6yXTMcUcnqS" role="2OqNvi">
                         <ref role="37wK5l" node="8mo7j2avnj" resolve="keep" />
                         <node concept="37vLTw" id="6yXTMcUco80" role="37wK5m">
-                          <ref role="3cqZAo" node="6yXTMcUclWc" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2JM" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6yXTMcUclWc" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2JM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6yXTMcUclWd" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2JN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10934,7 +10933,7 @@
                             <node concept="3clFbF" id="2F_rKqEehAV" role="3cqZAp">
                               <node concept="2OqwBi" id="2F_rKqEehAW" role="3clFbG">
                                 <node concept="37vLTw" id="2F_rKqEehAX" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2F_rKqEehAZ" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2JO" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="2F_rKqEehAY" role="2OqNvi">
                                   <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
@@ -10942,9 +10941,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2F_rKqEehAZ" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2JO" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2F_rKqEehB0" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2JP" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -10960,15 +10959,15 @@
                               <node concept="liA8E" id="2F_rKqEehB7" role="2OqNvi">
                                 <ref role="37wK5l" node="6yXTMcUb66e" resolve="getRootNodes" />
                                 <node concept="37vLTw" id="2F_rKqEehB8" role="37wK5m">
-                                  <ref role="3cqZAo" node="2F_rKqEehB9" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2JQ" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2F_rKqEehB9" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2JQ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2F_rKqEehBa" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2JR" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/com.mbeddr.mpsutil.test.util.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/com.mbeddr.mpsutil.test.util.msd
index c0684ffee23..ce3242b9a80 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/com.mbeddr.mpsutil.test.util.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/com.mbeddr.mpsutil.test.util.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.test.util" uuid="fdfc256f-c0b4-4ea1-9ada-e6e752358eb7" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.test.util" uuid="fdfc256f-c0b4-4ea1-9ada-e6e752358eb7" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,14 +10,13 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/models/com/mbeddr/mpsutil/test/util.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/models/com/mbeddr/mpsutil/test/util.mps
index 0271ca6d3e7..fbe93dd66bd 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/models/com/mbeddr/mpsutil/test/util.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test.util/models/com/mbeddr/mpsutil/test/util.mps
@@ -2,7 +2,7 @@
 <model ref="fdfc256f-c0b4-4ea1-9ada-e6e752358eb7/r:c8a1c63c-511b-4685-8f66-17b348dd5cb3(com.mbeddr.mpsutil.test.util/com.mbeddr.mpsutil.test.util)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -59,7 +59,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -73,12 +73,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -91,7 +92,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -99,7 +100,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -110,7 +111,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
       </concept>
@@ -201,7 +201,7 @@
                         <node concept="3clFbF" id="3JMPeKaIoYT" role="3cqZAp">
                           <node concept="2OqwBi" id="3JMPeKaIoYU" role="3clFbG">
                             <node concept="37vLTw" id="3JMPeKaIoYV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3JMPeKaIoYX" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2JS" resolve="it" />
                             </node>
                             <node concept="liA8E" id="3JMPeKaIoYW" role="2OqNvi">
                               <ref role="37wK5l" to="7wpd:3JMPeKaHTtq" resolve="toString" />
@@ -209,9 +209,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3JMPeKaIoYX" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2JS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3JMPeKaIoYY" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2JT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/com.mbeddr.mpsutil.test.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/com.mbeddr.mpsutil.test.msd
index 97e267da120..8446f20234a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/com.mbeddr.mpsutil.test.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/com.mbeddr.mpsutil.test.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.lib" uuid="ebc3846f-fa92-4849-93e4-dec2faf6b78f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.lib" uuid="ebc3846f-fa92-4849-93e4-dec2faf6b78f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/models/com/mbeddr/mpsutil/test/modelone.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/models/com/mbeddr/mpsutil/test/modelone.mps
index 093c6114100..1c1aa99dbc4 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/models/com/mbeddr/mpsutil/test/modelone.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.test/models/com/mbeddr/mpsutil/test/modelone.mps
@@ -41,7 +41,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -52,13 +52,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/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 7b91ad00216..a0bf541c02d 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.toolrunner" uuid="ae441f5b-4037-4c89-8804-269f57e2feb1" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.toolrunner" uuid="ae441f5b-4037-4c89-8804-269f57e2feb1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner.mps
index 54a0ab3b14c..eda475b633d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -41,7 +41,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -162,7 +162,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -187,7 +187,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -222,6 +222,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -257,7 +258,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -303,7 +304,6 @@
         <child id="1562299158920737514" name="initSize" index="3lWHg$" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
@@ -815,7 +815,7 @@
                           <node concept="liA8E" id="4CtHBqNls$z" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                             <node concept="37vLTw" id="4CtHBqNls$$" role="37wK5m">
-                              <ref role="3cqZAo" node="4CtHBqNls$B" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2JU" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -828,9 +828,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4CtHBqNls$B" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2JU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4CtHBqNls$C" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2JV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -884,7 +884,7 @@
                           <node concept="liA8E" id="4CtHBqNls_1" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                             <node concept="37vLTw" id="4CtHBqNls_2" role="37wK5m">
-                              <ref role="3cqZAo" node="4CtHBqNls_5" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2JW" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -897,9 +897,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4CtHBqNls_5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2JW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4CtHBqNls_6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2JX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1594,15 +1594,15 @@
                               <node concept="liA8E" id="1mocVhABLTE" role="2OqNvi">
                                 <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                                 <node concept="37vLTw" id="1mocVhABMx9" role="37wK5m">
-                                  <ref role="3cqZAo" node="1mocVhABLE_" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2JY" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1mocVhABLE_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2JY" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1mocVhABLEA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2JZ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1653,15 +1653,15 @@
                               <node concept="liA8E" id="1mocVhABWZU" role="2OqNvi">
                                 <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                                 <node concept="37vLTw" id="1mocVhABWZV" role="37wK5m">
-                                  <ref role="3cqZAo" node="1mocVhABWZW" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2K0" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1mocVhABWZW" role="1bW2Oz">
+                        <node concept="gl6BB" id="2SR9xrsN2K0" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1mocVhABWZX" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2SR9xrsN2K1" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner/plugin.mps
index db09eb56ee0..5891c294e0f 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/models/com/mbeddr/mpsutil/toolrunner/plugin.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/com.mbeddr.mpsutil.traceExplorer.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/com.mbeddr.mpsutil.traceExplorer.msd
index 151b46257cc..511998157d9 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/com.mbeddr.mpsutil.traceExplorer.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/com.mbeddr.mpsutil.traceExplorer.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.traceExplorer" uuid="726886d1-ef90-4249-a08f-1e3ec23a7113" moduleVersion="0" pluginKind="PLUGIN_CORE" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.traceExplorer" uuid="726886d1-ef90-4249-a08f-1e3ec23a7113" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -27,7 +26,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
@@ -38,7 +37,7 @@
     <language slang="l:517077fd-e44f-4338-a475-1d29781dfdb8:jetbrains.mps.lang.feedback.skeleton" version="0" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
@@ -63,7 +62,6 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
index e30c71a0b95..54cad17aaec 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
@@ -366,6 +366,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -511,7 +512,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -2040,6 +2040,24 @@
                   <node concept="2es0OD" id="47H5HUY7qZC" role="2OqNvi">
                     <node concept="1bVj0M" id="47H5HUY7qZE" role="23t8la">
                       <node concept="3clFbS" id="47H5HUY7qZF" role="1bW5cS">
+                        <node concept="3cpWs8" id="7T$stG1oMht" role="3cqZAp">
+                          <node concept="3cpWsn" id="7T$stG1oMhu" role="3cpWs9">
+                            <property role="TrG5h" value="filter" />
+                            <node concept="3uibUv" id="7T$stG1oMhv" role="1tU5fm">
+                              <ref role="3uigEE" node="3LPUFytXo4e" resolve="IComputationTraceFilter" />
+                            </node>
+                            <node concept="1eOMI4" id="7T$stG1oYdi" role="33vP2m">
+                              <node concept="10QFUN" id="7T$stG1oYdf" role="1eOMHV">
+                                <node concept="3uibUv" id="7T$stG1oYdk" role="10QFUM">
+                                  <ref role="3uigEE" node="3LPUFytXo4e" resolve="IComputationTraceFilter" />
+                                </node>
+                                <node concept="37vLTw" id="7T$stG1pclK" role="10QFUP">
+                                  <ref role="3cqZAo" node="2SR9xrsN2K2" resolve="it" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                         <node concept="3clFbF" id="47H5HUY3R$M" role="3cqZAp">
                           <node concept="2OqwBi" id="47H5HUY8vF8" role="3clFbG">
                             <node concept="37vLTw" id="47H5HUY8mRb" role="2Oq$k0">
@@ -2051,8 +2069,8 @@
                                   <node concept="1pGfFk" id="47H5HUY3R$O" role="2ShVmc">
                                     <property role="373rjd" value="true" />
                                     <ref role="37wK5l" node="47H5HUWqveZ" resolve="FilterMenuOption" />
-                                    <node concept="37vLTw" id="47H5HUY3R$P" role="37wK5m">
-                                      <ref role="3cqZAo" node="47H5HUY7qZG" resolve="it" />
+                                    <node concept="37vLTw" id="7T$stG1pFyJ" role="37wK5m">
+                                      <ref role="3cqZAo" node="7T$stG1oMhu" resolve="filter" />
                                     </node>
                                   </node>
                                 </node>
@@ -2060,7 +2078,7 @@
                                   <ref role="37wK5l" node="4SlhOgz037X" resolve="setSelected" />
                                   <node concept="2OqwBi" id="17348R1v1XK" role="37wK5m">
                                     <node concept="37vLTw" id="17348R1uZPg" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="47H5HUY7qZG" resolve="it" />
+                                      <ref role="3cqZAo" node="7T$stG1oMhu" resolve="filter" />
                                     </node>
                                     <node concept="liA8E" id="17348R1vecs" role="2OqNvi">
                                       <ref role="37wK5l" node="17348R1sqmA" resolve="isSelectedByDefault" />
@@ -2072,9 +2090,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="47H5HUY7qZG" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2K2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="47H5HUY7qZH" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2K3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2122,7 +2140,7 @@
                             <node concept="3clFbF" id="kZqQ807xLm" role="3cqZAp">
                               <node concept="2OqwBi" id="kZqQ807zeS" role="3clFbG">
                                 <node concept="37vLTw" id="kZqQ807xLl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="kZqQ807ncC" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2K4" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="kZqQ807K2Y" role="2OqNvi">
                                   <ref role="37wK5l" node="4SlhOgyMb0b" resolve="isSelected" />
@@ -2130,9 +2148,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="kZqQ807ncC" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2K4" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="kZqQ807ncD" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2K5" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2622,7 +2640,7 @@
                     <node concept="3clFbF" id="6kHzpifMM9j" role="3cqZAp">
                       <node concept="2OqwBi" id="6kHzpifMM9k" role="3clFbG">
                         <node concept="37vLTw" id="6kHzpifMM9l" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6kHzpifMM9n" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2K6" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6kHzpifMM9m" role="2OqNvi">
                           <ref role="37wK5l" node="4SlhOgyMb0b" resolve="isSelected" />
@@ -2630,9 +2648,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6kHzpifMM9n" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2K6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6kHzpifMM9o" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2K7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2643,7 +2661,7 @@
                   <node concept="3clFbF" id="6kHzpifMM9s" role="3cqZAp">
                     <node concept="2OqwBi" id="6kHzpifMM9t" role="3clFbG">
                       <node concept="37vLTw" id="6kHzpifMM9u" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6kHzpifMM9w" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2K8" resolve="it" />
                       </node>
                       <node concept="liA8E" id="6kHzpifMM9v" role="2OqNvi">
                         <ref role="37wK5l" node="6kHzpifJ4JJ" resolve="getFilter" />
@@ -2651,9 +2669,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6kHzpifMM9w" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2K8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6kHzpifMM9x" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2K9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2954,7 +2972,7 @@
                           <ref role="37wK5l" to="jkm4:~JBCheckboxMenuItem.&lt;init&gt;(java.lang.String,javax.swing.Icon,boolean)" resolve="JBCheckboxMenuItem" />
                           <node concept="2OqwBi" id="4SH1LdhxgoJ" role="37wK5m">
                             <node concept="37vLTw" id="4SH1LdhxgoK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4SH1Ldhq_9P" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ka" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4SH1LdhxgoL" role="2OqNvi">
                               <ref role="37wK5l" node="5t$QzkV$gRZ" resolve="getName" />
@@ -2962,7 +2980,7 @@
                           </node>
                           <node concept="2OqwBi" id="4SH1LdiC9MK" role="37wK5m">
                             <node concept="37vLTw" id="4SH1LdiC0Sv" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4SH1Ldhq_9P" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ka" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4SH1LdiCCSz" role="2OqNvi">
                               <ref role="37wK5l" node="4SH1LdiAh7R" resolve="getIcon" />
@@ -2970,7 +2988,7 @@
                           </node>
                           <node concept="2OqwBi" id="4SH1LdiFbK4" role="37wK5m">
                             <node concept="37vLTw" id="4SH1LdiF6U0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4SH1Ldhq_9P" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Ka" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4SH1LdiFxi8" role="2OqNvi">
                               <ref role="37wK5l" node="4SlhOgyMb0b" resolve="isSelected" />
@@ -3009,7 +3027,7 @@
                                   <node concept="3clFbF" id="4SH1Ldh_cYT" role="3cqZAp">
                                     <node concept="2OqwBi" id="4SH1Ldh_icA" role="3clFbG">
                                       <node concept="37vLTw" id="4SH1Ldh_cYS" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4SH1Ldhq_9P" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2Ka" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="4SH1Ldh_C_C" role="2OqNvi">
                                         <ref role="37wK5l" node="4SlhOgz037X" resolve="setSelected" />
@@ -3054,10 +3072,10 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4SH1Ldhq_9P" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ka" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
                   <property role="3TUv4t" value="true" />
-                  <node concept="2jxLKc" id="4SH1Ldhq_9Q" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Kb" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3189,7 +3207,6 @@
     <node concept="2tJIrI" id="T08V6J3cR1" role="jymVt" />
     <node concept="3clFb_" id="7rNasV5CUrg" role="jymVt">
       <property role="TrG5h" value="showSelectionDialog" />
-      <node concept="3Tmbuc" id="6fyeJ0bqx0V" role="1B3o_S" />
       <node concept="3cqZAl" id="7rNasV5CUri" role="3clF45" />
       <node concept="3clFbS" id="7rNasV5CUpY" role="3clF47">
         <node concept="3clFbF" id="T08V6J7PW$" role="3cqZAp">
@@ -3198,6 +3215,7 @@
           </node>
         </node>
       </node>
+      <node concept="3Tmbuc" id="6fyeJ0bqx0V" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="5IR_boHPoSf" role="jymVt" />
     <node concept="3clFb_" id="3EF07BwzX8k" role="jymVt">
@@ -3393,18 +3411,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="3EF07Bw$r8w" role="3cqZAp">
-              <node concept="2OqwBi" id="3EF07Bw$r8x" role="3clFbG">
-                <node concept="37vLTw" id="3EF07Bw$r8y" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3EF07Bw$r7s" resolve="actions" />
-                </node>
-                <node concept="TSZUe" id="3EF07Bw$r8z" role="2OqNvi">
-                  <node concept="37vLTw" id="4SH1Ldi2nXg" role="25WWJ7">
-                    <ref role="3cqZAo" node="4SH1Ldi3K8o" resolve="filterAction" />
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="1Wc70l" id="4SH1Ldjnjyo" role="3clFbw">
             <node concept="2OqwBi" id="4SH1Ldjo4h5" role="3uHU7w">
@@ -5183,7 +5189,6 @@
         <node concept="10P_77" id="7IhZGc$yTRL" role="1tU5fm" />
       </node>
       <node concept="3cqZAl" id="7IhZGc$yJxr" role="3clF45" />
-      <node concept="3Tmbuc" id="6fyeJ0bpNXF" role="1B3o_S" />
       <node concept="3clFbS" id="7IhZGc$yJxt" role="3clF47">
         <node concept="1QHqEK" id="7IhZGc$yXeh" role="3cqZAp">
           <node concept="1QHqEC" id="7IhZGc$yXei" role="1QHqEI">
@@ -5274,6 +5279,7 @@
           </node>
         </node>
       </node>
+      <node concept="3Tmbuc" id="6fyeJ0bpNXF" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7IhZGc$yEPL" role="jymVt" />
     <node concept="3clFb_" id="5U8d23PWJAY" role="jymVt">
@@ -6796,7 +6802,6 @@
     <node concept="2tJIrI" id="4yQfyMjqHwi" role="jymVt" />
     <node concept="3clFb_" id="2JfTTG8lxVb" role="jymVt">
       <property role="TrG5h" value="highlightCodeForRec" />
-      <node concept="3Tmbuc" id="6fyeJ0bpskn" role="1B3o_S" />
       <node concept="10P_77" id="2JfTTG8lxVd" role="3clF45" />
       <node concept="37vLTG" id="2JfTTG8lxV2" role="3clF46">
         <property role="TrG5h" value="rec" />
@@ -6962,6 +6967,7 @@
           <node concept="3clFbT" id="2JfTTG8lxV1" role="3cqZAk" />
         </node>
       </node>
+      <node concept="3Tmbuc" id="6fyeJ0bpskn" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="2JfTTG8mgKj" role="jymVt" />
     <node concept="2tJIrI" id="2JfTTG8mhRQ" role="jymVt" />
@@ -7155,7 +7161,7 @@
                               <ref role="37wK5l" to="rgfa:~TreePath.&lt;init&gt;(java.lang.Object[])" resolve="TreePath" />
                               <node concept="2OqwBi" id="4yQfyMjxlld" role="37wK5m">
                                 <node concept="37vLTw" id="4yQfyMjxCqa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4yQfyMjxB8$" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Kc" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="4yQfyMjxllf" role="2OqNvi">
                                   <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getPath()" resolve="getPath" />
@@ -7165,9 +7171,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4yQfyMjxB8$" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Kc" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4yQfyMjxB8_" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Kd" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -7350,7 +7356,7 @@
                               <ref role="37wK5l" to="rgfa:~TreePath.&lt;init&gt;(java.lang.Object[])" resolve="TreePath" />
                               <node concept="2OqwBi" id="2JfTTG8sA59" role="37wK5m">
                                 <node concept="37vLTw" id="2JfTTG8sA5a" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2JfTTG8sA5c" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Ke" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="2JfTTG8sA5b" role="2OqNvi">
                                   <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getPath()" resolve="getPath" />
@@ -7360,9 +7366,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2JfTTG8sA5c" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2Ke" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2JfTTG8sA5d" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2Kf" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -7952,6 +7958,10 @@
       </node>
     </node>
     <node concept="2tJIrI" id="$lfQMocIya" role="jymVt" />
+    <node concept="3Tm1VV" id="2jSY3BO827F" role="1B3o_S" />
+    <node concept="3uibUv" id="4yQfyMjqdhB" role="1zkMxy">
+      <ref role="3uigEE" to="jkm4:~SimpleToolWindowPanel" resolve="SimpleToolWindowPanel" />
+    </node>
     <node concept="3clFb_" id="6fyeJ0brdBQ" role="jymVt">
       <property role="TrG5h" value="selectFirstLeafCell" />
       <node concept="3clFbS" id="l9iXyRdj8f" role="3clF47">
@@ -8086,10 +8096,6 @@
       <node concept="3cqZAl" id="l9iXyRdiz5" role="3clF45" />
       <node concept="3Tmbuc" id="3EF07Bwwcm5" role="1B3o_S" />
     </node>
-    <node concept="3Tm1VV" id="2jSY3BO827F" role="1B3o_S" />
-    <node concept="3uibUv" id="4yQfyMjqdhB" role="1zkMxy">
-      <ref role="3uigEE" to="jkm4:~SimpleToolWindowPanel" resolve="SimpleToolWindowPanel" />
-    </node>
   </node>
   <node concept="3HP615" id="43aY2QmSq3e">
     <property role="TrG5h" value="ITraceRecord" />
@@ -9278,7 +9284,7 @@
                       </node>
                       <node concept="2OqwBi" id="3LPUFyumz2s" role="3uHU7B">
                         <node concept="37vLTw" id="3LPUFyumz2t" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3LPUFyumz2v" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Kg" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3LPUFyumz2u" role="2OqNvi">
                           <ref role="37wK5l" node="3LPUFyukLuk" resolve="getName" />
@@ -9287,9 +9293,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3LPUFyumz2v" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Kg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3LPUFyumz2w" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Kh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9341,15 +9347,15 @@
                       </node>
                       <node concept="TSZUe" id="4SH1LdjmwwA" role="2OqNvi">
                         <node concept="37vLTw" id="4SH1LdjmyfF" role="25WWJ7">
-                          <ref role="3cqZAo" node="4SH1Ldj_UiZ" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Ki" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4SH1Ldj_UiZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ki" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4SH1Ldj_Uj0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Kj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10224,7 +10230,7 @@
                             <node concept="liA8E" id="7rNasV3$5wR" role="2OqNvi">
                               <ref role="37wK5l" node="7rNasV3yuDs" resolve="getChildContainingTraceRecord" />
                               <node concept="37vLTw" id="7rNasV3$5wT" role="37wK5m">
-                                <ref role="3cqZAo" node="7rNasV3o_MP" resolve="seq" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Kk" resolve="seq" />
                               </node>
                             </node>
                           </node>
@@ -10265,9 +10271,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7rNasV3o_MP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Kk" role="1bW2Oz">
                       <property role="TrG5h" value="seq" />
-                      <node concept="2jxLKc" id="7rNasV3o_MQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Kl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10717,14 +10723,14 @@
                               </node>
                               <node concept="2WmjW8" id="3LPUFyunxr0" role="2OqNvi">
                                 <node concept="37vLTw" id="3LPUFyunxr1" role="25WWJ7">
-                                  <ref role="3cqZAo" node="3LPUFyunxr7" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2Km" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                           <node concept="3y3z36" id="3LPUFyunxr2" role="3uHU7B">
                             <node concept="37vLTw" id="3LPUFyunxr6" role="3uHU7B">
-                              <ref role="3cqZAo" node="3LPUFyunxr7" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2Km" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="3LPUFyup_Rk" role="3uHU7w">
                               <ref role="3cqZAo" node="3LPUFyupte2" resolve="targetNode" />
@@ -10733,9 +10739,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3LPUFyunxr7" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Km" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3LPUFyunxr8" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Kn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -10955,16 +10961,16 @@
                             </node>
                             <node concept="3JPx81" id="4lVwGzUyxPd" role="2OqNvi">
                               <node concept="37vLTw" id="4lVwGzUyxPe" role="25WWJ7">
-                                <ref role="3cqZAo" node="4lVwGzUyxPf" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2Ko" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4lVwGzUyxPf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2Ko" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4lVwGzUyxPg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2Kp" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -11299,7 +11305,7 @@
                       <node concept="2OqwBi" id="3LPUFytZNkN" role="3clFbG">
                         <node concept="2OqwBi" id="3LPUFytZNkO" role="2Oq$k0">
                           <node concept="37vLTw" id="3LPUFytZNkP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3LPUFytZNkV" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Kq" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3LPUFytZNkQ" role="2OqNvi">
                             <ref role="37wK5l" node="43aY2QmSqUE" resolve="getTarget" />
@@ -11319,9 +11325,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3LPUFytZNkV" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2Kq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3LPUFytZNkW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2Kr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11634,7 +11640,7 @@
                       <node concept="1eOMI4" id="3LPUFyus8tM" role="3fr31v">
                         <node concept="2OqwBi" id="3LPUFyus8tN" role="1eOMHV">
                           <node concept="37vLTw" id="3LPUFyus8tO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3LPUFyus8tQ" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2Ks" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3LPUFyus8tP" role="2OqNvi">
                             <ref role="37wK5l" to="2ahs:3T40JVg4NQV" resolve="neverEverShow" />
@@ -11644,9 +11650,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3LPUFyus8tQ" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ks" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3LPUFyus8tR" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Kt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12030,7 +12036,7 @@
                   <node concept="3clFbF" id="6any$Y9KmYQ" role="3cqZAp">
                     <node concept="2OqwBi" id="6any$Y9KmYR" role="3clFbG">
                       <node concept="37vLTw" id="6any$Y9KmYS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6any$Y9KmYU" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Ku" resolve="it" />
                       </node>
                       <node concept="liA8E" id="6any$Y9KmYT" role="2OqNvi">
                         <ref role="37wK5l" node="6any$Y9INnb" resolve="setup" />
@@ -12041,9 +12047,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6any$Y9KmYU" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ku" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6any$Y9KmYV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Kv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12114,7 +12120,7 @@
                   <node concept="3clFbF" id="6any$Y9Kohw" role="3cqZAp">
                     <node concept="2OqwBi" id="6any$Y9Kohx" role="3clFbG">
                       <node concept="37vLTw" id="6any$Y9Kohy" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6any$Y9Koh$" resolve="it" />
+                        <ref role="3cqZAo" node="2SR9xrsN2Kw" resolve="it" />
                       </node>
                       <node concept="liA8E" id="6any$Y9Kohz" role="2OqNvi">
                         <ref role="37wK5l" node="6any$Y9INUn" resolve="tearDown" />
@@ -12122,9 +12128,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6any$Y9Koh$" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Kw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6any$Y9Koh_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Kx" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12260,7 +12266,7 @@
                     <node concept="2OqwBi" id="6kHzpifYdr5" role="3clFbG">
                       <node concept="2OqwBi" id="6kHzpifYdr6" role="2Oq$k0">
                         <node concept="37vLTw" id="6kHzpifYdr7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6kHzpifYdrb" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Ky" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6kHzpifYdr8" role="2OqNvi">
                           <ref role="37wK5l" node="3LPUFyui3UX" resolve="getChildren" />
@@ -12278,9 +12284,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6kHzpifYdrb" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Ky" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6kHzpifYdrc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Kz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12361,7 +12367,7 @@
                     <node concept="3clFbF" id="17348R1rJYm" role="3cqZAp">
                       <node concept="2OqwBi" id="17348R1rL83" role="3clFbG">
                         <node concept="37vLTw" id="17348R1rJYl" role="2Oq$k0">
-                          <ref role="3cqZAo" node="17348R1rI8l" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2K$" resolve="it" />
                         </node>
                         <node concept="liA8E" id="17348R1rN8Z" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
@@ -12369,9 +12375,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="17348R1rI8l" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2K$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="17348R1rI8m" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2K_" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="17348R1rI8n" role="2S7zOq">
@@ -12403,7 +12409,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="17348R1rCHB" role="3uHU7w">
                                       <node concept="37vLTw" id="17348R1rCHC" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="17348R1rCHT" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2KA" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="17348R1rCHD" role="2OqNvi">
                                         <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
@@ -12414,7 +12420,7 @@
                                 <node concept="2OqwBi" id="17348R1rCHE" role="3uHU7w">
                                   <node concept="2OqwBi" id="17348R1rCHF" role="2Oq$k0">
                                     <node concept="37vLTw" id="17348R1rCHG" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="17348R1rCHT" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2KA" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="17348R1rCHH" role="2OqNvi">
                                       <ref role="37wK5l" node="43aY2QmSqUE" resolve="getTarget" />
@@ -12431,7 +12437,7 @@
                             </node>
                             <node concept="3EllGN" id="17348R1rCHK" role="3uHU7w">
                               <node concept="37vLTw" id="17348R1rCHL" role="3ElVtu">
-                                <ref role="3cqZAo" node="17348R1rCHT" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2KA" resolve="it" />
                               </node>
                               <node concept="37vLTw" id="17348R1rCHM" role="3ElQJh">
                                 <ref role="3cqZAo" node="4lVwGzU_C$q" resolve="avoidinfiniteTrees" />
@@ -12450,7 +12456,7 @@
                       </node>
                       <node concept="3EllGN" id="17348R1rCHQ" role="3uHU7B">
                         <node concept="37vLTw" id="17348R1rCHR" role="3ElVtu">
-                          <ref role="3cqZAo" node="17348R1rCHT" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2KA" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="17348R1rCHS" role="3ElQJh">
                           <ref role="3cqZAo" node="4lVwGzU_C$q" resolve="avoidinfiniteTrees" />
@@ -12459,9 +12465,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="17348R1rCHT" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2KA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="17348R1rCHU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2KB" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/com.mbeddr.mpsutil.typesystem.rt.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/com.mbeddr.mpsutil.typesystem.rt.msd
index d837c9a208e..d86bf323a58 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/com.mbeddr.mpsutil.typesystem.rt.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/com.mbeddr.mpsutil.typesystem.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.typesystem.trace.rt" uuid="be896c0f-4f34-4122-95ff-1aef962f5725" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.typesystem.trace.rt" uuid="be896c0f-4f34-4122-95ff-1aef962f5725" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -23,13 +22,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/rt/m.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/rt/m.mps
index 78bfa88e66d..e5bd63b7316 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/rt/m.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/rt/m.mps
@@ -23,7 +23,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -104,7 +104,7 @@
       <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,14 +126,14 @@
       <concept id="1202077725299" name="jetbrains.mps.baseLanguage.structure.DefaultSetAccessor" flags="ng" index="3xqBd$">
         <child id="1202077744034" name="visibility" index="3xqFEP" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps
index 753a5b9492b..1b26188b9ef 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps
@@ -4,8 +4,8 @@
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -23,6 +23,8 @@
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
+    <import index="evo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.newTypesystem.context(MPS.Core/)" />
+    <import index="ev0w" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking.backend(MPS.Core/)" implicit="true" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" implicit="true" />
   </imports>
   <registry>
@@ -33,6 +35,8 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="7458746815261976739" name="requiredAccess" index="2YLI8m" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -67,7 +71,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -89,7 +93,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -149,6 +153,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
@@ -201,7 +208,7 @@
       <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -223,7 +230,7 @@
       <concept id="1202077725299" name="jetbrains.mps.baseLanguage.structure.DefaultSetAccessor" flags="ng" index="3xqBd$">
         <child id="1202077744034" name="visibility" index="3xqFEP" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -240,11 +247,15 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -256,7 +267,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -266,24 +277,12 @@
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG" />
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -318,7 +317,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -360,40 +358,137 @@
   <node concept="sE7Ow" id="7GAH1cGe8w">
     <property role="TrG5h" value="benchmarkTypesystemForModel" />
     <property role="2uzpH1" value="Benchmark Typesystem" />
+    <property role="2YLI8m" value="6u2MFnph2yg/read" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="7GAH1cGe8x" role="tncku">
       <node concept="3clFbS" id="7GAH1cGe8y" role="2VODD2">
-        <node concept="3cpWs8" id="7GAH1cKt1C" role="3cqZAp">
-          <node concept="3cpWsn" id="7GAH1cKt1D" role="3cpWs9">
-            <property role="TrG5h" value="rootNodes" />
-            <property role="3TUv4t" value="true" />
-            <node concept="2I9FWS" id="7GAH1cWWrp" role="1tU5fm" />
-            <node concept="2OqwBi" id="7GAH1cKt1F" role="33vP2m">
-              <node concept="2OqwBi" id="7GAH1cKt1G" role="2Oq$k0">
-                <node concept="2WthIp" id="7GAH1cKt1H" role="2Oq$k0" />
-                <node concept="3gHZIF" id="7egl4EhFJ4H" role="2OqNvi">
-                  <ref role="2WH_rO" node="7GAH1cGe95" resolve="model" />
-                </node>
-              </node>
-              <node concept="2RRcyG" id="7egl4Ehz1AA" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="7egl4EhyUCL" role="3cqZAp">
           <node concept="2YIFZM" id="7egl4EhyULc" role="3clFbG">
             <ref role="37wK5l" to="c3o8:7GAH1d1Rpg" resolve="setEnabled" />
             <ref role="1Pybhc" to="c3o8:7GAH1d1QJ$" resolve="TypesystemTrace" />
           </node>
         </node>
-        <node concept="3cpWs8" id="7GAH1cKUPg" role="3cqZAp">
-          <node concept="3cpWsn" id="7GAH1cKUPh" role="3cpWs9">
-            <property role="TrG5h" value="owner" />
-            <node concept="2ShNRf" id="7GAH1cKUPi" role="33vP2m">
-              <node concept="1pGfFk" id="7GAH1cKUPj" role="2ShVmc">
-                <ref role="37wK5l" to="u78q:~DefaultTypecheckingContextOwner.&lt;init&gt;()" resolve="DefaultTypecheckingContextOwner" />
-              </node>
+        <node concept="3clFbH" id="30RNHFs1y5s" role="3cqZAp" />
+        <node concept="3cpWs8" id="30RNHFs1AGL" role="3cqZAp">
+          <node concept="3cpWsn" id="30RNHFs1AGM" role="3cpWs9">
+            <property role="TrG5h" value="tf" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="30RNHFs1ACQ" role="1tU5fm">
+              <ref role="3uigEE" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
             </node>
-            <node concept="3uibUv" id="7GAH1cKUPk" role="1tU5fm">
-              <ref role="3uigEE" to="u78q:~ITypeContextOwner" resolve="ITypeContextOwner" />
+            <node concept="2YIFZM" id="30RNHFs1AGN" role="33vP2m">
+              <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
+              <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="7lAg7aDDyGL" role="3cqZAp">
+          <node concept="1PaTwC" id="7lAg7aDDyGM" role="1aUNEU">
+            <node concept="3oM_SD" id="7lAg7aDDyGO" role="1PaTwD">
+              <property role="3oM_SC" value="TODO:" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1Ybm" role="1PaTwD">
+              <property role="3oM_SC" value="deprecated" />
+            </node>
+            <node concept="3oM_SD" id="7lAg7aDE20Z" role="1PaTwD">
+              <property role="3oM_SC" value="TypeContextManager" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1Ya0" role="1PaTwD">
+              <property role="3oM_SC" value="API" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1Yg7" role="1PaTwD">
+              <property role="3oM_SC" value="replaced" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1Yhw" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1Yi0" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1Yjk" role="1PaTwD">
+              <property role="3oM_SC" value="new" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs1YkF" role="1PaTwD">
+              <property role="3oM_SC" value="one." />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29be" role="1PaTwD">
+              <property role="3oM_SC" value="Check" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29bN" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29cS" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29d9" role="1PaTwD">
+              <property role="3oM_SC" value="approach" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29em" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29eC" role="1PaTwD">
+              <property role="3oM_SC" value="right" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29gs" role="1PaTwD">
+              <property role="3oM_SC" value="(1" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29h4" role="1PaTwD">
+              <property role="3oM_SC" value="session" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29jM" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29k9" role="1PaTwD">
+              <property role="3oM_SC" value="whole" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29kz" role="1PaTwD">
+              <property role="3oM_SC" value="model," />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs29lP" role="1PaTwD">
+              <property role="3oM_SC" value="perhaps?)" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="30RNHFs29Vr" role="3cqZAp">
+          <node concept="1PaTwC" id="30RNHFs29Vs" role="1aUNEU">
+            <node concept="3oM_SD" id="30RNHFs29XH" role="1PaTwD">
+              <property role="3oM_SC" value=" " />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2ai7" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2aib" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2aig" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2ane" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2ano" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2aoM" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2apO" role="1PaTwD">
+              <property role="3oM_SC" value="necessary" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2aqr" role="1PaTwD">
+              <property role="3oM_SC" value="rules" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2atF" role="1PaTwD">
+              <property role="3oM_SC" value="get" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2atU" role="1PaTwD">
+              <property role="3oM_SC" value="activated" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2ax8" role="1PaTwD">
+              <property role="3oM_SC" value="(including" />
+            </node>
+            <node concept="3oM_SD" id="30RNHFs2aBw" role="1PaTwD">
+              <property role="3oM_SC" value="non-ts)" />
             </node>
           </node>
         </node>
@@ -401,129 +496,80 @@
           <node concept="2GrKxI" id="7egl4Ehz5oV" role="2Gsz3X">
             <property role="TrG5h" value="rootNode" />
           </node>
-          <node concept="37vLTw" id="7egl4Ehz6oE" role="2GsD0m">
-            <ref role="3cqZAo" node="7GAH1cKt1D" resolve="rootNodes" />
+          <node concept="2OqwBi" id="30RNHFs1_2m" role="2GsD0m">
+            <node concept="2OqwBi" id="30RNHFs1_2n" role="2Oq$k0">
+              <node concept="2WthIp" id="30RNHFs1_2o" role="2Oq$k0" />
+              <node concept="3gHZIF" id="30RNHFs1_2p" role="2OqNvi">
+                <ref role="2WH_rO" node="7GAH1cGe95" resolve="model" />
+              </node>
+            </node>
+            <node concept="2RRcyG" id="30RNHFs1_2q" role="2OqNvi" />
           </node>
           <node concept="3clFbS" id="7egl4Ehz5oZ" role="2LFqv$">
-            <node concept="3SKdUt" id="7lAg7aDDyGL" role="3cqZAp">
-              <node concept="1PaTwC" id="7lAg7aDDyGM" role="1aUNEU">
-                <node concept="3oM_SD" id="7lAg7aDDyGO" role="1PaTwD">
-                  <property role="3oM_SC" value="TODO:" />
-                </node>
-                <node concept="3oM_SD" id="7lAg7aDE232" role="1PaTwD">
-                  <property role="3oM_SC" value="replace" />
-                </node>
-                <node concept="3oM_SD" id="7lAg7aDE24_" role="1PaTwD">
-                  <property role="3oM_SC" value="deprecated" />
-                </node>
-                <node concept="3oM_SD" id="7lAg7aDE20Z" role="1PaTwD">
-                  <property role="3oM_SC" value="API" />
+            <node concept="3clFbF" id="30RNHFs1CYP" role="3cqZAp">
+              <node concept="2OqwBi" id="30RNHFs1D$4" role="3clFbG">
+                <node concept="37vLTw" id="30RNHFs1CYN" role="2Oq$k0">
+                  <ref role="3cqZAo" node="30RNHFs1AGM" resolve="tf" />
                 </node>
-                <node concept="3oM_SD" id="7lAg7aDE1WR" role="1PaTwD">
-                  <property role="3oM_SC" value="(checkRecursively()" />
-                </node>
-                <node concept="3oM_SD" id="7lAg7aDDyTf" role="1PaTwD">
-                  <property role="3oM_SC" value="doesn't" />
-                </node>
-                <node concept="3oM_SD" id="7lAg7aDE27n" role="1PaTwD">
-                  <property role="3oM_SC" value="apply" />
-                </node>
-                <node concept="3oM_SD" id="7lAg7aDE27I" role="1PaTwD">
-                  <property role="3oM_SC" value="non-typesystem" />
-                </node>
-                <node concept="3oM_SD" id="7lAg7aDE2a4" role="1PaTwD">
-                  <property role="3oM_SC" value="rules)" />
-                </node>
-              </node>
-            </node>
-            <node concept="1X3_iC" id="7lAg7aDDyWi" role="lGtFl">
-              <property role="3V$3am" value="statement" />
-              <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-              <node concept="3clFbF" id="4wDwLRRKFpP" role="8Wnug">
-                <node concept="2OqwBi" id="4wDwLRRKFDf" role="3clFbG">
-                  <node concept="2YIFZM" id="4wDwLRRKFu5" role="2Oq$k0">
-                    <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
-                    <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
-                  </node>
-                  <node concept="liA8E" id="4wDwLRRKFUW" role="2OqNvi">
-                    <ref role="37wK5l" to="1ka:~TypecheckingFacade.checkRecursively(org.jetbrains.mps.openapi.model.SNode,java.util.function.Consumer)" resolve="checkRecursively" />
-                    <node concept="2GrUjf" id="4wDwLRRKFWn" role="37wK5m">
+                <node concept="liA8E" id="30RNHFs1E97" role="2OqNvi">
+                  <ref role="37wK5l" to="ev0w:~TypecheckingSessionHandler.runIsolated(jetbrains.mps.typechecking.TypecheckingSession$Flags,java.util.function.Consumer)" resolve="runIsolated" />
+                  <node concept="2YIFZM" id="30RNHFs1Cbi" role="37wK5m">
+                    <ref role="37wK5l" to="1ka:~TypecheckingSession$Flags.forRoot(org.jetbrains.mps.openapi.model.SNode)" resolve="forRoot" />
+                    <ref role="1Pybhc" to="1ka:~TypecheckingSession$Flags" resolve="TypecheckingSession.Flags" />
+                    <node concept="2GrUjf" id="30RNHFs1CEG" role="37wK5m">
                       <ref role="2Gs0qQ" node="7egl4Ehz5oV" resolve="rootNode" />
                     </node>
-                    <node concept="1bVj0M" id="4wDwLRRKG6d" role="37wK5m">
-                      <node concept="3clFbS" id="4wDwLRRKG6f" role="1bW5cS" />
-                      <node concept="37vLTG" id="4wDwLRRKGCh" role="1bW2Oz">
-                        <property role="TrG5h" value="item" />
-                        <node concept="3uibUv" id="4wDwLRRKGCg" role="1tU5fm">
-                          <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
-                        </node>
+                  </node>
+                  <node concept="1bVj0M" id="30RNHFs1Ec2" role="37wK5m">
+                    <node concept="37vLTG" id="30RNHFs1EJV" role="1bW2Oz">
+                      <property role="TrG5h" value="session" />
+                      <node concept="3uibUv" id="30RNHFs1EJS" role="1tU5fm">
+                        <ref role="3uigEE" to="1ka:~TypecheckingSession" resolve="TypecheckingSession" />
                       </node>
                     </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="7egl4EhzYMq" role="3cqZAp">
-              <node concept="3cpWsn" id="7egl4EhzYMt" role="3cpWs9">
-                <property role="TrG5h" value="finalNode" />
-                <property role="3TUv4t" value="true" />
-                <node concept="3Tqbb2" id="7egl4EhzYMo" role="1tU5fm" />
-                <node concept="2GrUjf" id="7egl4EhzYSa" role="33vP2m">
-                  <ref role="2Gs0qQ" node="7egl4Ehz5oV" resolve="rootNode" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7GAH1cKT9v" role="3cqZAp">
-              <node concept="2OqwBi" id="7GAH1cKT9w" role="3clFbG">
-                <node concept="2YIFZM" id="7GAH1cKT9x" role="2Oq$k0">
-                  <ref role="1Pybhc" to="u78q:~TypeContextManager" resolve="TypeContextManager" />
-                  <ref role="37wK5l" to="u78q:~TypeContextManager.getInstance()" resolve="getInstance" />
-                </node>
-                <node concept="liA8E" id="7GAH1cKT9y" role="2OqNvi">
-                  <ref role="37wK5l" to="u78q:~TypeContextManager.runTypeCheckingAction(jetbrains.mps.typesystem.inference.ITypeContextOwner,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.ITypechecking$Action)" resolve="runTypeCheckingAction" />
-                  <node concept="37vLTw" id="7GAH1cKX9E" role="37wK5m">
-                    <ref role="3cqZAo" node="7GAH1cKUPh" resolve="owner" />
-                  </node>
-                  <node concept="37vLTw" id="7egl4EhzYSK" role="37wK5m">
-                    <ref role="3cqZAo" node="7egl4EhzYMt" resolve="finalNode" />
-                  </node>
-                  <node concept="2ShNRf" id="7GAH1cKT9_" role="37wK5m">
-                    <node concept="YeOm9" id="7GAH1cKT9A" role="2ShVmc">
-                      <node concept="1Y3b0j" id="7GAH1cKT9B" role="YeSDq">
-                        <property role="2bfB8j" value="true" />
-                        <ref role="1Y3XeK" to="u78q:~ITypechecking$Action" resolve="ITypechecking.Action" />
-                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                        <node concept="3Tm1VV" id="7GAH1cKT9C" role="1B3o_S" />
-                        <node concept="3clFb_" id="7GAH1cKT9D" role="jymVt">
-                          <property role="1EzhhJ" value="false" />
-                          <property role="TrG5h" value="run" />
-                          <property role="DiZV1" value="false" />
-                          <node concept="3Tm1VV" id="7GAH1cKT9E" role="1B3o_S" />
-                          <node concept="3cqZAl" id="7GAH1cKT9F" role="3clF45" />
-                          <node concept="37vLTG" id="7GAH1cKT9G" role="3clF46">
-                            <property role="TrG5h" value="typeCheckingContext" />
-                            <node concept="3uibUv" id="7GAH1cKT9H" role="1tU5fm">
-                              <ref role="3uigEE" to="u78q:~TypeCheckingContext" resolve="TypeCheckingContext" />
+                    <node concept="3clFbS" id="30RNHFs1Ec4" role="1bW5cS">
+                      <node concept="3cpWs8" id="30RNHFs1HpQ" role="3cqZAp">
+                        <node concept="3cpWsn" id="30RNHFs1HpR" role="3cpWs9">
+                          <property role="TrG5h" value="th" />
+                          <node concept="3uibUv" id="30RNHFs1Hc$" role="1tU5fm">
+                            <ref role="3uigEE" to="u78q:~TypeCheckerHelper" resolve="TypeCheckerHelper" />
+                          </node>
+                          <node concept="2OqwBi" id="30RNHFs1HpS" role="33vP2m">
+                            <node concept="37vLTw" id="30RNHFs1HpT" role="2Oq$k0">
+                              <ref role="3cqZAo" node="30RNHFs1EJV" resolve="session" />
+                            </node>
+                            <node concept="liA8E" id="30RNHFs1HpU" role="2OqNvi">
+                              <ref role="37wK5l" to="1ka:~TypecheckingSession.getData(java.lang.Class)" resolve="getData" />
+                              <node concept="3VsKOn" id="30RNHFs1HpV" role="37wK5m">
+                                <ref role="3VsUkX" to="u78q:~TypeCheckerHelper" resolve="TypeCheckerHelper" />
+                              </node>
                             </node>
                           </node>
-                          <node concept="3clFbS" id="7GAH1cKT9I" role="3clF47">
-                            <node concept="3clFbF" id="7GAH1d15rQ" role="3cqZAp">
-                              <node concept="2OqwBi" id="7GAH1d16Dv" role="3clFbG">
-                                <node concept="37vLTw" id="7GAH1d15rP" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7GAH1cKT9G" resolve="typeCheckingContext" />
-                                </node>
-                                <node concept="liA8E" id="7GAH1d18n_" role="2OqNvi">
-                                  <ref role="37wK5l" to="u78q:~TypeCheckingContext.checkIfNotChecked(org.jetbrains.mps.openapi.model.SNode,boolean)" resolve="checkIfNotChecked" />
-                                  <node concept="37vLTw" id="7egl4EhzZbT" role="37wK5m">
-                                    <ref role="3cqZAo" node="7egl4EhzYMt" resolve="finalNode" />
-                                  </node>
-                                  <node concept="3clFbT" id="7GAH1d18qt" role="37wK5m">
-                                    <property role="3clFbU" value="true" />
-                                  </node>
-                                </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="30RNHFs1FZY" role="3cqZAp">
+                        <node concept="2OqwBi" id="30RNHFs1Svk" role="3clFbG">
+                          <node concept="2ShNRf" id="30RNHFs1HT_" role="2Oq$k0">
+                            <node concept="1pGfFk" id="30RNHFs1QfN" role="2ShVmc">
+                              <property role="373rjd" value="true" />
+                              <ref role="37wK5l" to="evo:~HoleTypecheckingContext.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.TypeCheckerHelper)" resolve="HoleTypecheckingContext" />
+                              <node concept="2GrUjf" id="30RNHFs1QAx" role="37wK5m">
+                                <ref role="2Gs0qQ" node="7egl4Ehz5oV" resolve="rootNode" />
+                              </node>
+                              <node concept="37vLTw" id="30RNHFs1Ryg" role="37wK5m">
+                                <ref role="3cqZAo" node="30RNHFs1HpR" resolve="th" />
                               </node>
                             </node>
                           </node>
+                          <node concept="liA8E" id="30RNHFs1TTC" role="2OqNvi">
+                            <ref role="37wK5l" to="evo:~SimpleTypecheckingContext.checkIfNotChecked(org.jetbrains.mps.openapi.model.SNode,boolean)" resolve="checkIfNotChecked" />
+                            <node concept="2GrUjf" id="30RNHFs1UnS" role="37wK5m">
+                              <ref role="2Gs0qQ" node="7egl4Ehz5oV" resolve="rootNode" />
+                            </node>
+                            <node concept="3clFbT" id="30RNHFs1VKy" role="37wK5m">
+                              <property role="3clFbU" value="true" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -815,7 +861,7 @@
                         <node concept="d57v9" id="2DOqMKsjPpZ" role="3clFbG">
                           <node concept="2OqwBi" id="2DOqMKsklkI" role="37vLTx">
                             <node concept="37vLTw" id="2DOqMKsjQll" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2DOqMKsjH37" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2KC" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2DOqMKsknAO" role="2OqNvi">
                               <ref role="37wK5l" to="c3o8:7egl4EhTqVU" resolve="getDuration" />
@@ -827,9 +873,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2DOqMKsjH37" role="1bW2Oz">
+                    <node concept="gl6BB" id="2SR9xrsN2KC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2DOqMKsjH38" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2SR9xrsN2KD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -873,7 +919,7 @@
                         <node concept="3clFbF" id="2DOqMKspcYV" role="3cqZAp">
                           <node concept="2OqwBi" id="2DOqMKspcYW" role="3clFbG">
                             <node concept="37vLTw" id="2DOqMKspcYX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2DOqMKspcYZ" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2KE" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2DOqMKspcYY" role="2OqNvi">
                               <ref role="37wK5l" to="c3o8:7egl4EhTqVU" resolve="getDuration" />
@@ -881,9 +927,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2DOqMKspcYZ" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2KE" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2DOqMKspcZ0" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2KF" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="1nlBCl" id="2DOqMKspcZ1" role="2S7zOq">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/com.mbeddr.mpsutil.userstyles.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/com.mbeddr.mpsutil.userstyles.runtime.msd
index 22979b97a94..a3969ea5dac 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/com.mbeddr.mpsutil.userstyles.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/com.mbeddr.mpsutil.userstyles.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.userstyles.runtime" uuid="664f2630-ebf5-429d-b331-94ccdf5410f6" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.userstyles.runtime" uuid="664f2630-ebf5-429d-b331-94ccdf5410f6" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -19,13 +18,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/models/com/mbeddr/mpsutil/userstyles/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/models/com/mbeddr/mpsutil/userstyles/runtime/plugin.mps
index 54113197547..8ebb0bf52d0 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/models/com/mbeddr/mpsutil/userstyles/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.runtime/models/com/mbeddr/mpsutil/userstyles/runtime/plugin.mps
@@ -49,7 +49,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -158,7 +158,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -188,7 +188,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -216,6 +216,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -225,7 +226,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -233,7 +234,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -266,7 +267,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -599,7 +599,7 @@
                                   <ref role="37wK5l" to="vvpk:~AttributesDescriptor.&lt;init&gt;(java.lang.String,com.intellij.openapi.editor.colors.TextAttributesKey)" resolve="AttributesDescriptor" />
                                   <node concept="2OqwBi" id="1gJuyfgBByf" role="37wK5m">
                                     <node concept="37vLTw" id="1gJuyfgBBex" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1gJuyfgBwF2" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2KG" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="1gJuyfgBBL_" role="2OqNvi">
                                       <ref role="37wK5l" node="1gJuyfgAyqv" resolve="getDisplayText" />
@@ -610,7 +610,7 @@
                                     <ref role="37wK5l" to="drih:~TextAttributesKey.createTextAttributesKey(java.lang.String)" resolve="createTextAttributesKey" />
                                     <node concept="2OqwBi" id="1gJuyfgBznv" role="37wK5m">
                                       <node concept="37vLTw" id="1gJuyfgBz3M" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1gJuyfgBwF2" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2KG" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="1gJuyfgBzB7" role="2OqNvi">
                                         <ref role="37wK5l" node="1gJuyfgAyqJ" resolve="getId" />
@@ -621,9 +621,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1gJuyfgBwF2" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2KG" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1gJuyfgBwF3" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2KH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -679,7 +679,7 @@
                                 <node concept="3clFbF" id="1gJuyfgBfDH" role="3cqZAp">
                                   <node concept="2OqwBi" id="1gJuyfgBfGT" role="3clFbG">
                                     <node concept="37vLTw" id="1gJuyfgBfDG" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1gJuyfgBflN" resolve="it" />
+                                      <ref role="3cqZAo" node="2SR9xrsN2KI" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="1gJuyfgBfMZ" role="2OqNvi">
                                       <ref role="37wK5l" node="1gJuyfgAzSO" resolve="getItems" />
@@ -687,9 +687,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1gJuyfgBflN" role="1bW2Oz">
+                              <node concept="gl6BB" id="2SR9xrsN2KI" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1gJuyfgBflO" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2SR9xrsN2KJ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -703,7 +703,7 @@
                                     <ref role="37wK5l" to="vvpk:~ColorDescriptor.&lt;init&gt;(java.lang.String,com.intellij.openapi.editor.colors.ColorKey,com.intellij.openapi.options.colors.ColorDescriptor$Kind)" resolve="ColorDescriptor" />
                                     <node concept="2OqwBi" id="1gJuyfgBhRg" role="37wK5m">
                                       <node concept="37vLTw" id="1gJuyfgBhCS" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1gJuyfgBg7F" resolve="it" />
+                                        <ref role="3cqZAo" node="2SR9xrsN2KK" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="1gJuyfgBi1t" role="2OqNvi">
                                         <ref role="37wK5l" node="1gJuyfgAyqv" resolve="getDisplayText" />
@@ -714,7 +714,7 @@
                                       <ref role="1Pybhc" to="drih:~ColorKey" resolve="ColorKey" />
                                       <node concept="2OqwBi" id="1gJuyfgBitM" role="37wK5m">
                                         <node concept="37vLTw" id="1gJuyfgBifE" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1gJuyfgBg7F" resolve="it" />
+                                          <ref role="3cqZAo" node="2SR9xrsN2KK" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="1gJuyfgBiBJ" role="2OqNvi">
                                           <ref role="37wK5l" node="1gJuyfgAyqJ" resolve="getId" />
@@ -729,9 +729,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1gJuyfgBg7F" role="1bW2Oz">
+                            <node concept="gl6BB" id="2SR9xrsN2KK" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1gJuyfgBg7G" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2SR9xrsN2KL" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1461,7 +1461,7 @@
                     <node concept="3clFbF" id="6eTqwB9kzIx" role="3cqZAp">
                       <node concept="2OqwBi" id="6eTqwB9kzIy" role="3clFbG">
                         <node concept="37vLTw" id="6eTqwB9kzIz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6eTqwB9kzI_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2KM" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6eTqwB9kzI$" role="2OqNvi">
                           <ref role="37wK5l" node="1gJuyfgAzSO" resolve="getItems" />
@@ -1469,9 +1469,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6eTqwB9kzI_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2KM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6eTqwB9kzIA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2KN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1512,7 +1512,7 @@
                       </node>
                       <node concept="2OqwBi" id="6eTqwB9kBzv" role="3uHU7B">
                         <node concept="37vLTw" id="6eTqwB9kBwy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6eTqwB9kBbG" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2KO" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6eTqwB9kBBn" role="2OqNvi">
                           <ref role="37wK5l" node="1gJuyfgAyqJ" resolve="getId" />
@@ -1521,9 +1521,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6eTqwB9kBbG" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2KO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6eTqwB9kBbH" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2KP" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.sandbox/com.mbeddr.mpsutil.userstyles.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.sandbox/com.mbeddr.mpsutil.userstyles.sandbox.msd
index 392acee97c2..b08df9c38e5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.sandbox/com.mbeddr.mpsutil.userstyles.sandbox.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.userstyles.sandbox/com.mbeddr.mpsutil.userstyles.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.userstyles.sandbox" uuid="ca597d1f-190d-4268-af00-5253de379454" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.userstyles.sandbox" uuid="ca597d1f-190d-4268-af00-5253de379454" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:33745ab7-37dd-4c72-914d-eee6d52b9b33:com.mbeddr.mpsutil.userstyles.sandboxlang" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/com.mbeddr.mpsutil.varscope.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/com.mbeddr.mpsutil.varscope.runtime.msd
index d26be82bfda..a2c8a6f487b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/com.mbeddr.mpsutil.varscope.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/com.mbeddr.mpsutil.varscope.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.varscope.runtime" uuid="8e4567d9-0513-47fd-bfe7-fa3b33fe03ab" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.varscope.runtime" uuid="8e4567d9-0513-47fd-bfe7-fa3b33fe03ab" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -19,7 +18,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/models/com/mbeddr/mpsutil/varscope/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/models/com/mbeddr/mpsutil/varscope/runtime/plugin.mps
index 0ff13340e2d..4ce7326273e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/models/com/mbeddr/mpsutil/varscope/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.varscope.runtime/models/com/mbeddr/mpsutil/varscope/runtime/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
   <imports>
@@ -91,7 +91,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -108,13 +108,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -129,7 +130,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -157,7 +158,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -478,7 +478,7 @@
                     <node concept="2OqwBi" id="NrU95lKU8S" role="3clFbG">
                       <node concept="2OqwBi" id="NrU95lKU8T" role="2Oq$k0">
                         <node concept="37vLTw" id="NrU95lKU8U" role="2Oq$k0">
-                          <ref role="3cqZAo" node="NrU95lKU8Y" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2KQ" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="NrU95lKU8V" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -493,9 +493,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="NrU95lKU8Y" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2KQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="NrU95lKU8Z" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2KR" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/com.mbeddr.mpsutil.xmlImport.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/com.mbeddr.mpsutil.xmlImport.msd
index 26e119992fe..996c6bb0127 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/com.mbeddr.mpsutil.xmlImport.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/com.mbeddr.mpsutil.xmlImport.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.xmlImport" uuid="6f6d5be9-a352-48db-9081-851a6d5c535b" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.xmlImport" uuid="6f6d5be9-a352-48db-9081-851a6d5c535b" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -21,13 +20,13 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps
index 7be29d3631a..b23113e89d5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:67fd3fc1-34e7-4a5b-bf5a-87941fd4bee4(com.mbeddr.mpsutil.xmlImport.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -35,6 +35,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <property id="1213273179528" name="description" index="1WHSii" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
@@ -242,6 +243,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -368,7 +370,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -397,6 +398,7 @@
     <property role="TrG5h" value="pasteAsXmlContent" />
     <property role="2uzpH1" value="Paste as XML Content" />
     <property role="1WHSii" value="Paste XML element from clipboard" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="24KZuFtDg$g" role="1NuT2Z">
       <property role="TrG5h" value="context" />
       <node concept="3Tm6S6" id="24KZuFtDg$h" role="1B3o_S" />
@@ -1403,7 +1405,7 @@
                             <node concept="1eOMI4" id="4mEgncq48mx" role="37wK5m">
                               <node concept="10QFUN" id="4mEgncq48mw" role="1eOMHV">
                                 <node concept="37vLTw" id="4mEgncq48mv" role="10QFUP">
-                                  <ref role="3cqZAo" node="4mEgncq3SD0" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2KS" resolve="it" />
                                 </node>
                                 <node concept="3uibUv" id="4mEgncq48mu" role="10QFUM">
                                   <ref role="3uigEE" to="lhjl:~Element" resolve="Element" />
@@ -1413,9 +1415,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4mEgncq3SD0" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2KS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4mEgncq3SD1" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2KT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1660,7 +1662,7 @@
                     <node concept="3KaCP$" id="24KZuFtFHF1" role="3cqZAp">
                       <node concept="2OqwBi" id="24KZuFtFHF2" role="3KbGdf">
                         <node concept="37vLTw" id="24KZuFtFHF3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="24KZuFtFHFk" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2KU" resolve="it" />
                         </node>
                         <node concept="liA8E" id="24KZuFtFHF4" role="2OqNvi">
                           <ref role="37wK5l" to="lhjl:~Node.getNodeType()" resolve="getNodeType" />
@@ -1680,7 +1682,7 @@
                               </node>
                               <node concept="10QFUN" id="24KZuFtFL9a" role="33vP2m">
                                 <node concept="37vLTw" id="24KZuFtFL9b" role="10QFUP">
-                                  <ref role="3cqZAo" node="24KZuFtFHFk" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2KU" resolve="it" />
                                 </node>
                                 <node concept="3uibUv" id="24KZuFtFL9c" role="10QFUM">
                                   <ref role="3uigEE" to="lhjl:~Text" resolve="Text" />
@@ -1744,7 +1746,7 @@
                               <node concept="1eOMI4" id="24KZuFtFHFf" role="37wK5m">
                                 <node concept="10QFUN" id="24KZuFtFHFg" role="1eOMHV">
                                   <node concept="37vLTw" id="24KZuFtFHFh" role="10QFUP">
-                                    <ref role="3cqZAo" node="24KZuFtFHFk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2KU" resolve="it" />
                                   </node>
                                   <node concept="3uibUv" id="24KZuFtFHFi" role="10QFUM">
                                     <ref role="3uigEE" to="lhjl:~Element" resolve="Element" />
@@ -1763,7 +1765,7 @@
                               <node concept="3cpWs3" id="24KZuFtG7Zb" role="37wK5m">
                                 <node concept="2OqwBi" id="24KZuFtG7Zc" role="3uHU7w">
                                   <node concept="37vLTw" id="24KZuFtG7Zd" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="24KZuFtFHFk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2KU" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="24KZuFtG7Ze" role="2OqNvi">
                                     <ref role="37wK5l" to="lhjl:~Node.getNodeType()" resolve="getNodeType" />
@@ -1785,7 +1787,7 @@
                           <node concept="3cpWs3" id="24KZuFtFWnm" role="RRSoy">
                             <node concept="2OqwBi" id="24KZuFtFXtw" role="3uHU7w">
                               <node concept="37vLTw" id="24KZuFtFWQx" role="2Oq$k0">
-                                <ref role="3cqZAo" node="24KZuFtFHFk" resolve="it" />
+                                <ref role="3cqZAo" node="2SR9xrsN2KU" resolve="it" />
                               </node>
                               <node concept="liA8E" id="24KZuFtFYbm" role="2OqNvi">
                                 <ref role="37wK5l" to="lhjl:~Node.getNodeType()" resolve="getNodeType" />
@@ -1815,7 +1817,7 @@
                               <node concept="1eOMI4" id="5APcdZTZR0I" role="33vP2m">
                                 <node concept="10QFUN" id="5APcdZTZR0H" role="1eOMHV">
                                   <node concept="37vLTw" id="5APcdZTZR0G" role="10QFUP">
-                                    <ref role="3cqZAo" node="24KZuFtFHFk" resolve="it" />
+                                    <ref role="3cqZAo" node="2SR9xrsN2KU" resolve="it" />
                                   </node>
                                   <node concept="3uibUv" id="5APcdZTZR0F" role="10QFUM">
                                     <ref role="3uigEE" to="lhjl:~CDATASection" resolve="CDATASection" />
@@ -1848,9 +1850,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="24KZuFtFHFk" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2KU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="24KZuFtFHFl" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2KV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2188,6 +2190,7 @@
   <node concept="sE7Ow" id="4mEgncq5mFL">
     <property role="TrG5h" value="importXMLFile" />
     <property role="2uzpH1" value="Import XML File(s)" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4mEgncq5mFM" role="tncku">
       <node concept="3clFbS" id="4mEgncq5mFN" role="2VODD2">
         <node concept="3cpWs8" id="T1v2oLnKbA" role="3cqZAp">
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 b6afc4d763d..50e3f2ac987 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.xmodel.actions" uuid="d7e4c61d-aebf-43c6-b4ad-ab5fbe958b0c" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.xmodel.actions" uuid="d7e4c61d-aebf-43c6-b4ad-ab5fbe958b0c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1(de.itemis.mps.hacks.xmodelgen)</dependency>
@@ -26,14 +25,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/models/plugin.mps
index e5da8137fda..dc602f4058e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:349273be-ff89-4693-b685-ae3ceaa2275e(com.mbeddr.mpsutil.xmodel.actions.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
@@ -43,6 +43,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1211298967294" name="outsideCommandExecution" index="72QZ$" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -63,7 +64,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -83,7 +84,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -160,7 +161,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -179,7 +180,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -197,6 +198,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -204,7 +206,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -260,7 +262,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -298,7 +300,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
@@ -310,6 +311,7 @@
     <property role="TrG5h" value="DeriveGenplan" />
     <property role="2uzpH1" value="Derive Generation Plan" />
     <property role="72QZ$" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="5wEedBsfqYO" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
@@ -411,14 +413,14 @@
                                             <ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
                                           </node>
                                           <node concept="37vLTw" id="2BHiRxgm8go" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3tOCygy3AxD" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2KW" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3tOCygy3AxD" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2KW" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="3tOCygy3AxE" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2KX" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -837,6 +839,7 @@
     <property role="TrG5h" value="GenplanForLanguages" />
     <property role="72QZ$" value="true" />
     <property role="2uzpH1" value="Generation Plan for Languages" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="5ZP7uETz5w9" role="tncku">
       <node concept="3clFbS" id="5ZP7uETz5wa" role="2VODD2">
         <node concept="3cpWs8" id="4yCyDr3aMxG" role="3cqZAp">
@@ -983,14 +986,14 @@
                         <ref role="37wK5l" to="pjrh:~MetaAdapterByDeclaration.getLanguage(jetbrains.mps.smodel.Language)" resolve="getLanguage" />
                         <ref role="1Pybhc" to="pjrh:~MetaAdapterByDeclaration" resolve="MetaAdapterByDeclaration" />
                         <node concept="37vLTw" id="G1JaZHlHn$" role="37wK5m">
-                          <ref role="3cqZAo" node="G1JaZHlHn_" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2KY" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="G1JaZHlHn_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2KY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="G1JaZHlHnA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2KZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1207,14 +1210,14 @@
                                             <ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
                                           </node>
                                           <node concept="37vLTw" id="4yCyDr396pP" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4yCyDr396pQ" resolve="it" />
+                                            <ref role="3cqZAo" node="2SR9xrsN2L0" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4yCyDr396pQ" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2SR9xrsN2L0" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4yCyDr396pR" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2SR9xrsN2L1" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.opencsv/com.opencsv.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.opencsv/com.opencsv.msd
index 063fe4da64c..06fad9bea56 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.opencsv/com.opencsv.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.opencsv/com.opencsv.msd
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.opencsv" uuid="11045775-3aaf-4816-8077-8656c4e8fee1" moduleVersion="0" compileInMPS="true">
+<solution name="com.opencsv" uuid="11045775-3aaf-4816-8077-8656c4e8fee1" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}">
       <sourceRoot location="lib/opencsv-2.3.jar" />
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/opencsv-2.3.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/opencsv-2.3.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
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 90b4037740c..42ea7f37637 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="doc.com.mbeddr.mpsutil.multilingual" uuid="faa33f15-d79c-47ef-9a63-e4cfa550a98c" moduleVersion="0" compileInMPS="true">
+<solution name="doc.com.mbeddr.mpsutil.multilingual" uuid="faa33f15-d79c-47ef-9a63-e4cfa550a98c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d2a1d976-43a2-462f-ac3a-9b258ced839d(com.mbeddr.mpsutil.multilingual.baseLanguage)</dependency>
     <dependency reexport="false">23f985f2-965f-4af1-aee8-a32677429514(com.mbeddr.mpsutil.multilingual.common)</dependency>
@@ -36,7 +35,7 @@
     <language slang="l:ea7c5f4a-5621-4b35-a7bb-9aaab820eaf7:doc.com.mbeddr.mpsutil.multilingual.lang" version="-1" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/org.apache.batik.msd b/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/org.apache.batik.msd
index 00d4f6bc600..d942bb79628 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/org.apache.batik.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/org.apache.batik.msd
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.apache.batik" uuid="5ad14eca-28d7-4bce-b8e0-648908a49062" moduleVersion="0" compileInMPS="true">
+<solution name="org.apache.batik" uuid="5ad14eca-28d7-4bce-b8e0-648908a49062" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="batik-all-1.12.jar" />
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/batik-all-1.12.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/batik-all-1.12.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">96569509-ecfc-4944-b6c9-075faf02fe2c(org.xml)</dependency>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/models/configuration.mps b/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/models/configuration.mps
index 3da0b59ec49..53c10bfaee1 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/models/configuration.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/models/configuration.mps
@@ -14,7 +14,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -43,7 +43,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -52,7 +52,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/org.mockito.msd b/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/org.mockito.msd
index 2441f47572c..c4773a1f6ea 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/org.mockito.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/org.mockito/org.mockito.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mockito" uuid="9414e29c-0c8d-4bc7-b251-f312597fb993" moduleVersion="0" compileInMPS="true">
+<solution name="org.mockito" uuid="9414e29c-0c8d-4bc7-b251-f312597fb993" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -9,17 +9,14 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/libs/mockito-core-2.23.4.jar" />
+      <library location="${module}/libs/byte-buddy-1.9.3.jar" />
+      <library location="${module}/libs/byte-buddy-agent-1.9.3.jar" />
+      <library location="${module}/libs/objenesis-2.6.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/libs/mockito-core-2.23.4.jar" />
-    <stubModelEntry path="${module}/libs/byte-buddy-1.9.3.jar" />
-    <stubModelEntry path="${module}/libs/byte-buddy-agent-1.9.3.jar" />
-    <stubModelEntry path="${module}/libs/objenesis-2.6.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
@@ -36,4 +33,3 @@
     <module reference="9414e29c-0c8d-4bc7-b251-f312597fb993(org.mockito)" version="0" />
   </dependencyVersions>
 </solution>
-
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/org.xml/org.xml.msd b/code/languages/com.mbeddr.mpsutil/solutions/org.xml/org.xml.msd
index af1add9759a..f3ad355b97b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/org.xml/org.xml.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/org.xml/org.xml.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.xml" uuid="96569509-ecfc-4944-b6c9-075faf02fe2c" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="false">
+<solution name="org.xml" uuid="96569509-ecfc-4944-b6c9-075faf02fe2c" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}">
       <sourceRoot location="lib/xml-apis-ext.jar" />
       <sourceRoot location="lib/resolver.jar" />
       <sourceRoot location="lib/serializer.jar" />
@@ -9,17 +9,14 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="off" classes="off" ext="yes">
+    <facet type="java" compile="off" classes="mps" ext="yes">
       <classes generated="true" />
+      <library location="${module}/lib/resolver.jar" />
+      <library location="${module}/lib/serializer.jar" />
+      <library location="${module}/lib/xercesImpl.jar" />
+      <library location="${module}/lib/xml-apis-ext.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/resolver.jar" />
-    <stubModelEntry path="${module}/lib/serializer.jar" />
-    <stubModelEntry path="${module}/lib/xercesImpl.jar" />
-    <stubModelEntry path="${module}/lib/xml-apis-ext.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/com.mbeddr.mpsutil.compare.pattern.test.msd b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/com.mbeddr.mpsutil.compare.pattern.test.msd
index 7507f56eedc..f71b0a23a04 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/com.mbeddr.mpsutil.compare.pattern.test.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/com.mbeddr.mpsutil.compare.pattern.test.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.compare.pattern.test" uuid="88463ec0-b015-4440-b5f8-3e27fcbaa282" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.compare.pattern.test" uuid="88463ec0-b015-4440-b5f8-3e27fcbaa282" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps
index 54d94b7f1cb..e9f39512132 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps
@@ -11,7 +11,7 @@
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -151,7 +151,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -169,7 +169,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -187,7 +187,7 @@
     <language id="17566462-d837-4552-874c-64e45c10778a" name="com.mbeddr.mpsutil.compare.pattern">
       <concept id="665537614208925411" name="com.mbeddr.mpsutil.compare.pattern.structure.MemberAnnotation" flags="ng" index="uEgwc" />
       <concept id="3935692745220220029" name="com.mbeddr.mpsutil.compare.pattern.structure.GetConceptOperation" flags="ng" index="xs8ve" />
-      <concept id="3560698633098300404" name="com.mbeddr.mpsutil.compare.pattern.structure.IInitPart" flags="ng" index="2FoiXY">
+      <concept id="3560698633098300404" name="com.mbeddr.mpsutil.compare.pattern.structure.IInitPart" flags="ngI" index="2FoiXY">
         <child id="5455284157993911094" name="expression" index="2pJxcZ" />
         <child id="665537614208925694" name="annotation" index="uEg$h" />
       </concept>
@@ -222,6 +222,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -276,7 +277,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -288,7 +289,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -431,7 +431,7 @@
                       <node concept="2OqwBi" id="1ho_jHB_4Tt" role="3clFbG">
                         <node concept="2OqwBi" id="1ho_jHB_4Tu" role="2Oq$k0">
                           <node concept="37vLTw" id="1ho_jHB_4Tv" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1ho_jHB_4Tz" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2L2" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1ho_jHB_4Tw" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -446,9 +446,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1ho_jHB_4Tz" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2L2" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1ho_jHB_4T$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2L3" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -481,7 +481,7 @@
                       <node concept="2OqwBi" id="1ho_jHB_57m" role="3clFbG">
                         <node concept="2OqwBi" id="1ho_jHB_57n" role="2Oq$k0">
                           <node concept="37vLTw" id="1ho_jHB_57o" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1ho_jHB_57s" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2L4" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1ho_jHB_57p" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -496,9 +496,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1ho_jHB_57s" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2L4" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1ho_jHB_57t" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2L5" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1276,7 +1276,7 @@
                       <node concept="2OqwBi" id="1KJPJGe2VvE" role="3clFbG">
                         <node concept="2OqwBi" id="1KJPJGe2VvF" role="2Oq$k0">
                           <node concept="37vLTw" id="1KJPJGe2VvG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1KJPJGe2VvK" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2L6" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1KJPJGe2VvH" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1291,9 +1291,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1KJPJGe2VvK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2SR9xrsN2L6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1KJPJGe2VvL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2SR9xrsN2L7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/com.mbeddr.mpsutil.javainterpreter.test.mpl b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/com.mbeddr.mpsutil.javainterpreter.test.mpl
index 4aca0f1441b..c50ea8b8569 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/com.mbeddr.mpsutil.javainterpreter.test.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/com.mbeddr.mpsutil.javainterpreter.test.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/behavior.mps
index 2cfa05b5280..8fc035f3e2b 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/behavior.mps
@@ -92,7 +92,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -105,12 +105,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -125,7 +126,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -133,7 +134,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
     </language>
@@ -373,14 +373,14 @@
                             <ref role="37wK5l" to="2ahs:4jkUBhBVOKX" resolve="getInterpreterExecutable" />
                             <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
                             <node concept="37vLTw" id="7FtvAFycdiJ" role="37wK5m">
-                              <ref role="3cqZAo" node="40eYuE1yyCi" resolve="it" />
+                              <ref role="3cqZAo" node="2SR9xrsN2ut" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="40eYuE1yyCi" role="1bW2Oz">
+                      <node concept="gl6BB" id="2SR9xrsN2ut" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="40eYuE1yyCj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2SR9xrsN2uu" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/editor.mps
index 6adcf1d7bb5..3fb432361b3 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/editor.mps
@@ -40,7 +40,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/intentions.mps b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/intentions.mps
index aec378e4794..73364e2309d 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/intentions.mps
@@ -40,7 +40,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,7 +78,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/structure.mps
index 90c9ae61b53..ceb02454455 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.javainterpreter.test/languageModels/structure.mps
@@ -38,7 +38,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/models/test@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/models/test@tests.mps
index 8e25df38c2b..e4d2cf27a36 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/models/test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/models/test@tests.mps
@@ -6,7 +6,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
     <use id="4d43042b-3d26-46a9-888a-1ec4e4a2c81d" name="com.mbeddr.mpsutil.asynccell.sandbox" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="a8e9d313-443b-4557-a1d0-05f5ab8ab6d4" name="com.mbeddr.mpsutil.blutil.test.waitfor" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -83,7 +83,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -91,7 +91,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -124,7 +124,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/test.com.mbeddr.mpsutil.asynccell.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/test.com.mbeddr.mpsutil.asynccell.msd
index 02347f73c5f..bff21d54265 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/test.com.mbeddr.mpsutil.asynccell.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.asynccell/test.com.mbeddr.mpsutil.asynccell.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.asynccell" uuid="43370260-9020-4c2d-bf8a-d4755d82318d" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.asynccell" uuid="43370260-9020-4c2d-bf8a-d4755d82318d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">4d43042b-3d26-46a9-888a-1ec4e4a2c81d(com.mbeddr.mpsutil.asynccell.sandbox)</dependency>
     <dependency reexport="true">0381a253-2986-4e29-bd38-bdda504095e5(com.mbeddr.mpsutil.asynccell)</dependency>
@@ -25,7 +24,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/models/test.com.mbeddr.mpsutil.blutil.test.waitfor@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/models/test.com.mbeddr.mpsutil.blutil.test.waitfor@tests.mps
index 470e036db3f..c1420f149a1 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/models/test.com.mbeddr.mpsutil.blutil.test.waitfor@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/models/test.com.mbeddr.mpsutil.blutil.test.waitfor@tests.mps
@@ -86,7 +86,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,7 +97,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -134,7 +134,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -142,7 +142,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/test.com.mbeddr.mpsutil.blutil.test.waitfor.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/test.com.mbeddr.mpsutil.blutil.test.waitfor.msd
index e146788b062..66d3677f531 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/test.com.mbeddr.mpsutil.blutil.test.waitfor.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.blutil.test.waitfor/test.com.mbeddr.mpsutil.blutil.test.waitfor.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.blutil.test.waitfor" uuid="c4943a3c-45c9-4523-8723-a18368d2c1fc" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.blutil.test.waitfor" uuid="c4943a3c-45c9-4523-8723-a18368d2c1fc" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/models/test.com.mbeddr.mpsutil.compare.testlang.structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/models/test.com.mbeddr.mpsutil.compare.testlang.structure.mps
index 6c310354f23..8195f3c2643 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/models/test.com.mbeddr.mpsutil.compare.testlang.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/models/test.com.mbeddr.mpsutil.compare.testlang.structure.mps
@@ -23,7 +23,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/test.com.mbeddr.mpsutil.compare.testlang.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/test.com.mbeddr.mpsutil.compare.testlang.mpl
index 13aadba4fb4..c20c137651c 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/test.com.mbeddr.mpsutil.compare.testlang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare.testlang/test.com.mbeddr.mpsutil.compare.testlang.mpl
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps
index 940391ca320..fc3fc0bfafa 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps
@@ -5,7 +5,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f47b95d4-5e73-4c04-9204-18076950153b" name="com.mbeddr.mpsutil.compare" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
   </languages>
   <imports>
@@ -91,7 +91,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,12 +102,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -115,7 +116,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -164,7 +165,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -189,7 +190,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
@@ -274,7 +274,7 @@
                         <ref role="2WH_rO" node="Pu8Vy2dc_U" resolve="flattenDifferencesRecursive" />
                         <node concept="2OqwBi" id="Pu8Vy2drAu" role="2XxRq1">
                           <node concept="37vLTw" id="Pu8Vy2dr$a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="Pu8Vy2drwg" resolve="it" />
+                            <ref role="3cqZAo" node="2SR9xrsN2L8" resolve="it" />
                           </node>
                           <node concept="liA8E" id="Pu8Vy2drFH" role="2OqNvi">
                             <ref role="37wK5l" to="mqum:Pu8Vy2dgQy" resolve="getNestedDifferences" />
@@ -287,9 +287,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="Pu8Vy2drwg" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2L8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="Pu8Vy2drwh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2L9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -617,10 +617,6 @@
             </node>
           </node>
           <node concept="3clFbF" id="Pu8Vy2cY9F" role="3cqZAp">
-            <node concept="15s5l7" id="56OidHFwudL" role="lGtFl">
-              <property role="1eyWvh" value="FLAVOUR_CLASS=&quot;class jetbrains.mps.project.validation.ConceptFeatureCardinalityError&quot;;FLAVOUR_MESSAGE=&quot;No reference in the obligatory role 'variableDeclaration'&quot;;FLAVOUR_NODE_FEATURE=&quot;variableDeclaration&quot;;" />
-              <property role="huDt6" value="No reference in the obligatory role 'variableDeclaration'" />
-            </node>
             <node concept="37vLTI" id="Pu8Vy2cYdI" role="3clFbG">
               <node concept="37vLTw" id="Pu8Vy2cYdY" role="37vLTx">
                 <node concept="3xLA65" id="Pu8Vy2e38c" role="lGtFl">
@@ -631,6 +627,10 @@
                 <ref role="3cqZAo" node="Pu8Vy2cY8X" resolve="y" />
               </node>
             </node>
+            <node concept="15s5l7" id="56OidHFwudL" role="lGtFl">
+              <property role="1eyWvh" value="FLAVOUR_CLASS=&quot;class jetbrains.mps.project.validation.ConceptFeatureCardinalityError&quot;;FLAVOUR_MESSAGE=&quot;No reference in the obligatory role 'variableDeclaration'&quot;;FLAVOUR_NODE_FEATURE=&quot;variableDeclaration&quot;;" />
+              <property role="huDt6" value="No reference in the obligatory role 'variableDeclaration'" />
+            </node>
           </node>
         </node>
         <node concept="3xLA65" id="Pu8Vy2cZKL" role="lGtFl">
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 561c64147f4..4d2f710fc79 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.compare" uuid="f1331acb-f5b8-487b-9d42-6ffd5fcde7e3" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.compare" uuid="f1331acb-f5b8-487b-9d42-6ffd5fcde7e3" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)</dependency>
     <dependency reexport="false">6bbe9909-811d-4431-b023-f60f7e6d7891(test.com.mbeddr.mpsutil.compare.testlang)</dependency>
@@ -21,7 +20,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/models/test.com.mbeddr.mpsutil.contextactions.tests@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/models/test.com.mbeddr.mpsutil.contextactions.tests@tests.mps
index 497759d59a6..cbf75fa9060 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/models/test.com.mbeddr.mpsutil.contextactions.tests@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/models/test.com.mbeddr.mpsutil.contextactions.tests@tests.mps
@@ -70,7 +70,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -107,7 +107,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -120,7 +120,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -128,7 +128,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -151,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/test.com.mbeddr.mpsutil.contextactions.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/test.com.mbeddr.mpsutil.contextactions.msd
index 5087403e7cb..2cccc14e32e 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/test.com.mbeddr.mpsutil.contextactions.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.contextactions/test.com.mbeddr.mpsutil.contextactions.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.contextactions" uuid="a5aab8fa-2c00-4d8c-9d9e-320c6b7d9dea" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.contextactions" uuid="a5aab8fa-2c00-4d8c-9d9e-320c6b7d9dea" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterface.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterface.mps
index da40c344eaf..4de51efa593 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterface.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterface.mps
@@ -28,7 +28,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterfaceSuperClass.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterfaceSuperClass.mps
index 0666f4545bb..9de8f97bfa7 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterfaceSuperClass.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleInterfaceSuperClass.mps
@@ -39,7 +39,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleReference.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleReference.mps
index 3222f38b833..ac79c57bbe7 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleReference.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classMultipleReference.mps
@@ -31,7 +31,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classNonMPSTypes.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classNonMPSTypes.mps
index d1c390ba90f..26a38f1a944 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classNonMPSTypes.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classNonMPSTypes.mps
@@ -34,7 +34,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReference.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReference.mps
index 58b8b432a13..aca3d358c82 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReference.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReference.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReferenceChild.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReferenceChild.mps
index e3ce1c83bea..7ae89b1476b 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReferenceChild.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/classReferenceChild.mps
@@ -30,7 +30,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/emptyClass.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/emptyClass.mps
index 977d6d5e5bb..7c56e3b3918 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/emptyClass.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/emptyClass.mps
@@ -16,7 +16,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInheritance.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInheritance.mps
index 2eb7b526396..54d62fa247b 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInheritance.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInheritance.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInterfaceInheritance.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInterfaceInheritance.mps
index fcb6e427735..74ebb004082 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInterfaceInheritance.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/multipleInterfaceInheritance.mps
@@ -39,7 +39,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassMultipleProperty.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassMultipleProperty.mps
index cfa99d14414..7766f36b3bd 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassMultipleProperty.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassMultipleProperty.mps
@@ -23,7 +23,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassOneProperty.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassOneProperty.mps
index b1ab96ca3d5..208190f02e2 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassOneProperty.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/simpleClassOneProperty.mps
@@ -23,7 +23,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/superClass.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/superClass.mps
index 1f6b542dadc..dbda47b38b4 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/superClass.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/superClass.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentNumberOfChildren.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentNumberOfChildren.mps
index 201bb2ad6e0..be6fce7b2a2 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentNumberOfChildren.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentNumberOfChildren.mps
@@ -55,7 +55,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps
index 74675f10afc..21a91ed2aab 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps
@@ -58,7 +58,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/test.com.mbeddr.mpsutil.ecore.metaModelImport.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/test.com.mbeddr.mpsutil.ecore.metaModelImport.msd
index 8277e473473..0613000b7d7 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/test.com.mbeddr.mpsutil.ecore.metaModelImport.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/test.com.mbeddr.mpsutil.ecore.metaModelImport.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.ecore.metaModelImport" uuid="5da3f266-d744-4554-a337-854f76f37e5f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.ecore.metaModelImport" uuid="5da3f266-d744-4554-a337-854f76f37e5f" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -23,7 +22,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/sandbox.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/sandbox.mps
index 796f96b2d62..cb5f4e025a2 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/sandbox.mps
@@ -13,7 +13,7 @@
       <concept id="20746029588651015" name="com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.structure.Runnable" flags="ng" index="1Gq2xw">
         <child id="20746029588651180" name="runnableItems" index="1Gq2zb" />
       </concept>
-      <concept id="20746029588650303" name="com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.structure.IReferable" flags="ng" index="1Gq2Po">
+      <concept id="20746029588650303" name="com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.structure.IReferable" flags="ngI" index="1Gq2Po">
         <property id="20746029588650304" name="name" index="1Gq2OB" />
       </concept>
       <concept id="20746029588650297" name="com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.structure.Amalthea" flags="ng" index="1Gq2Pu">
@@ -54,7 +54,7 @@
         <property id="20746029588650990" name="osekTaskGroup" index="1Gq2Y9" />
         <property id="20746029588650992" name="multipleTaskActivationLimit" index="1Gq2Yn" />
       </concept>
-      <concept id="20746029588650942" name="com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.structure.AbstractProcess" flags="ng" index="1Gq2Zp">
+      <concept id="20746029588650942" name="com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.structure.AbstractProcess" flags="ngI" index="1Gq2Zp">
         <property id="20746029588650943" name="priority" index="1Gq2Zo" />
       </concept>
       <concept id="20746029588650940" name="com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel.structure.SWModel" flags="ng" index="1Gq2Zr">
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance5.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance5.mps
index b54881be801..8d866d95c36 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance5.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance5.mps
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:ca11f989-0c62-4a05-ad71-160413139366(test.com.mbeddr.mpsutil.ecore.modelImportExport.testInstance5)">
   <persistence version="9" />
-  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="b883f758-9a65-4140-ac15-f5b95052c219" name="test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance6.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance6.mps
index cc4166140c9..eea3ea2213e 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance6.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance6.mps
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:d26f10bc-a521-4dff-b73d-981c8a51b04a(test.com.mbeddr.mpsutil.ecore.modelImportExport.testInstance6)">
   <persistence version="9" />
-  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="36dc6740-50ca-47a8-b44f-4cf0c584b822" name="test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/test.com.mbeddr.mpsutil.ecore.modelImportExport.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/test.com.mbeddr.mpsutil.ecore.modelImportExport.msd
index 55a083e60aa..958417b80f1 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/test.com.mbeddr.mpsutil.ecore.modelImportExport.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/test.com.mbeddr.mpsutil.ecore.modelImportExport.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.ecore.modelImportExport" uuid="e3fe9621-6e2b-47be-b722-97dd69d692c2" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.ecore.modelImportExport" uuid="e3fe9621-6e2b-47be-b722-97dd69d692c2" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -19,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl
index b7f47dc4dd1..a7ec14ba0b0 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl
@@ -17,7 +17,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl
index c03eab5e1c8..101efb383de 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl
@@ -17,7 +17,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl
index 3549385917e..d71a982313b 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl
@@ -17,7 +17,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl
index 9f8cbb9604c..5fe3ba87c55 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl
@@ -17,7 +17,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl
index 5407f6294c4..9604e5ef789 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl
@@ -17,7 +17,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl
index 8cf9e574ace..a7752731bb9 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl
@@ -17,7 +17,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/models/test/com/mbeddr/mpsutil/extensionclass/test@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/models/test/com/mbeddr/mpsutil/extensionclass/test@tests.mps
index eea7e302ee5..c8cdf0d1163 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/models/test/com/mbeddr/mpsutil/extensionclass/test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/models/test/com/mbeddr/mpsutil/extensionclass/test@tests.mps
@@ -23,7 +23,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -98,7 +98,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -109,7 +109,7 @@
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -126,7 +126,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/test.com.mbeddr.mpsutil.extensionclass.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/test.com.mbeddr.mpsutil.extensionclass.msd
index f3b6a960d5d..d665b5b6cfe 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/test.com.mbeddr.mpsutil.extensionclass.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.extensionclass/test.com.mbeddr.mpsutil.extensionclass.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.extensionclass" uuid="460ef3f4-0093-4c53-8c6a-bb8c36a7a621" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.extensionclass" uuid="460ef3f4-0093-4c53-8c6a-bb8c36a7a621" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">f39336d3-1288-47ee-bbfe-ad2ea7e4504e(com.mbeddr.mpsutil.extensionclass)</dependency>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/models/test/com/mbeddr/mpsutil/iconchar/test/test@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/models/test/com/mbeddr/mpsutil/iconchar/test/test@tests.mps
index 5c6dd61863c..f2dae59f044 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/models/test/com/mbeddr/mpsutil/iconchar/test/test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/models/test/com/mbeddr/mpsutil/iconchar/test/test@tests.mps
@@ -67,7 +67,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -89,7 +89,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -97,7 +97,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/test.com.mbeddr.mpsutil.iconchar.test.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/test.com.mbeddr.mpsutil.iconchar.test.msd
index e1bf0e862d5..e789c221bc8 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/test.com.mbeddr.mpsutil.iconchar.test.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar.test/test.com.mbeddr.mpsutil.iconchar.test.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.iconchar.test" uuid="b0eea09e-7c43-47c6-bfb5-2b1b36108b5f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.iconchar.test" uuid="b0eea09e-7c43-47c6-bfb5-2b1b36108b5f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/languageModels/structure.mps
index 1ff14838f3a..8c3b051f120 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/languageModels/structure.mps
@@ -37,7 +37,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/test.com.mbeddr.mpsutil.iconchar.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/test.com.mbeddr.mpsutil.iconchar.mpl
index 383ceea9384..a95a33d8720 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/test.com.mbeddr.mpsutil.iconchar.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/test.com.mbeddr.mpsutil.iconchar.mpl
@@ -14,12 +14,11 @@
   <accessoryModels>
     <model modelUID="r:b3e48a27-6547-47a1-8503-7e5f36ff6fd9(test.com.mbeddr.mpsutil.iconchar.accessory)" />
   </accessoryModels>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/models/test@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/models/test@tests.mps
index 351a8e1f939..30244c206f1 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/models/test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/models/test@tests.mps
@@ -4,11 +4,11 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="b1c7d06f-525d-43b5-9b0a-2fc8f7f076ba" name="jetbrains.mps.editor.contextActionsTool.lang.menus" version="0" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="3a48930f-3451-44fd-9b09-4e7ef448f2bb" name="com.mbeddr.mpsutil.parameterizedMenu" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports>
@@ -83,7 +83,7 @@
         <child id="5692353713941573325" name="textFunction" index="1hCUd6" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
@@ -139,7 +139,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -149,6 +149,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -173,7 +174,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -188,7 +189,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1522217801069359738" name="jetbrains.mps.baseLanguage.collections.structure.ReduceLeftOperation" flags="nn" index="1MCZdW" />
     </language>
@@ -249,26 +249,26 @@
                       <node concept="2ZBlsa" id="4l0F8G24uLw" role="2Oq$k0" />
                       <node concept="1MCZdW" id="lb9twM9txR" role="2OqNvi">
                         <node concept="1bVj0M" id="lb9twM9txT" role="23t8la">
+                          <node concept="gl6BB" id="4BrUvzNDxW3" role="1bW2Oz">
+                            <property role="TrG5h" value="a" />
+                            <node concept="2jxLKc" id="4BrUvzNDxW4" role="1tU5fm" />
+                          </node>
+                          <node concept="gl6BB" id="4BrUvzNDyvZ" role="1bW2Oz">
+                            <property role="TrG5h" value="b" />
+                            <node concept="2jxLKc" id="4BrUvzNDyw0" role="1tU5fm" />
+                          </node>
                           <node concept="3clFbS" id="lb9twM9txU" role="1bW5cS">
                             <node concept="3clFbF" id="lb9twM9tQo" role="3cqZAp">
                               <node concept="3cpWs3" id="lb9twM9uOC" role="3clFbG">
                                 <node concept="37vLTw" id="lb9twM9uOI" role="3uHU7w">
-                                  <ref role="3cqZAo" node="lb9twM9txX" resolve="b" />
+                                  <ref role="3cqZAo" node="4BrUvzNDyvZ" resolve="b" />
                                 </node>
                                 <node concept="37vLTw" id="lb9twM9tQn" role="3uHU7B">
-                                  <ref role="3cqZAo" node="lb9twM9txV" resolve="a" />
+                                  <ref role="3cqZAo" node="4BrUvzNDxW3" resolve="a" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="lb9twM9txV" role="1bW2Oz">
-                            <property role="TrG5h" value="a" />
-                            <node concept="2jxLKc" id="lb9twM9txW" role="1tU5fm" />
-                          </node>
-                          <node concept="Rh6nW" id="lb9twM9txX" role="1bW2Oz">
-                            <property role="TrG5h" value="b" />
-                            <node concept="2jxLKc" id="lb9twM9txY" role="1tU5fm" />
-                          </node>
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/test.com.mbeddr.mpsutil.parameterizedMenu.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/test.com.mbeddr.mpsutil.parameterizedMenu.msd
index ca75ad74b4a..ba88f1e4273 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/test.com.mbeddr.mpsutil.parameterizedMenu.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.parameterizedMenu/test.com.mbeddr.mpsutil.parameterizedMenu.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.parameterizedMenu" uuid="27ece083-b311-4d4d-8800-381f5eebf40e" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.parameterizedMenu" uuid="27ece083-b311-4d4d-8800-381f5eebf40e" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
@@ -23,14 +22,14 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:b1c7d06f-525d-43b5-9b0a-2fc8f7f076ba:jetbrains.mps.editor.contextActionsTool.lang.menus" version="0" />
     <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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <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="6" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/models/editor.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/models/editor.mps
index 70ba0f9b5fc..6be756e8398 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/models/editor.mps
@@ -65,7 +65,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -88,7 +88,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1163613035599" name="jetbrains.mps.lang.editor.structure.CellMenuPart_AbstractGroup_Query" flags="in" index="3GJtP1" />
@@ -126,12 +126,13 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -156,7 +157,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -165,7 +166,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -295,7 +295,7 @@
                             <node concept="3clFbF" id="6hvYmWkepdG" role="3cqZAp">
                               <node concept="2OqwBi" id="6hvYmWkepnJ" role="3clFbG">
                                 <node concept="37vLTw" id="6hvYmWkepdF" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6hvYmWkep8V" resolve="it" />
+                                  <ref role="3cqZAo" node="2SR9xrsN2uy" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6hvYmWkepE_" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -303,9 +303,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6hvYmWkep8V" role="1bW2Oz">
+                          <node concept="gl6BB" id="2SR9xrsN2uy" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6hvYmWkep8W" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2SR9xrsN2uz" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/test.com.mbeddr.mpsutil.placeholderTextList.testlang.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/test.com.mbeddr.mpsutil.placeholderTextList.testlang.mpl
index 2839e3d61d1..382f4ac1f98 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/test.com.mbeddr.mpsutil.placeholderTextList.testlang.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/test.com.mbeddr.mpsutil.placeholderTextList.testlang.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">03411b7a-a9ce-4d39-bc96-3ef49f103e72(test.com.mbeddr.mpsutil.placeholderTextList.testlang)</dependency>
   </dependencies>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/models/test/com/mbeddr/mpsutil/placeholderTextList/sandbox.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/models/test/com/mbeddr/mpsutil/placeholderTextList/sandbox.mps
index 59ca97e09e4..7c9f0ab072d 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/models/test/com/mbeddr/mpsutil/placeholderTextList/sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/models/test/com/mbeddr/mpsutil/placeholderTextList/sandbox.mps
@@ -40,7 +40,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -50,13 +50,13 @@
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/test.com.mbeddr.mpsutil.placeholderTextList.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/test.com.mbeddr.mpsutil.placeholderTextList.msd
index a574ca8506e..f13bdc8af83 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/test.com.mbeddr.mpsutil.placeholderTextList.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.placeholderTextList/test.com.mbeddr.mpsutil.placeholderTextList.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.placeholderTextList" uuid="dddfc90c-fc13-4226-8bd5-5fda7a2509f3" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.placeholderTextList" uuid="dddfc90c-fc13-4226-8bd5-5fda7a2509f3" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/models/test.com.mbeddr.mpsutil.smodule.operation@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/models/test.com.mbeddr.mpsutil.smodule.operation@tests.mps
index 98024f121ec..4e23b4552dc 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/models/test.com.mbeddr.mpsutil.smodule.operation@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/models/test.com.mbeddr.mpsutil.smodule.operation@tests.mps
@@ -100,7 +100,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -128,7 +128,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -147,7 +147,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -158,7 +158,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/test.com.mbeddr.mpsutil.smodule.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/test.com.mbeddr.mpsutil.smodule.msd
index 856bb0848d3..a5c8aee7ace 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/test.com.mbeddr.mpsutil.smodule.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.smodule/test.com.mbeddr.mpsutil.smodule.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.smodule" uuid="8f03b570-a3bd-4d60-ab99-1a693a83da9d" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.smodule" uuid="8f03b570-a3bd-4d60-ab99-1a693a83da9d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/generator/template/main@generator.mps
index b85d345c26b..91ce42c03af 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/generator/template/main@generator.mps
@@ -86,7 +86,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/languageModels/structure.mps
index 4ba9ff1014f..a584c770152 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/languageModels/structure.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/test.com.mbeddr.mpsutil.xml.fix.support.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/test.com.mbeddr.mpsutil.xml.fix.support.mpl
index 6720d88ebab..42e39988ce3 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/test.com.mbeddr.mpsutil.xml.fix.support.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix.support/test.com.mbeddr.mpsutil.xml.fix.support.mpl
@@ -30,7 +30,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -58,12 +58,11 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/models/test/com/mbeddr/mpsutil/xml/fix/tests@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/models/test/com/mbeddr/mpsutil/xml/fix/tests@tests.mps
index 955dff16c09..68d964c70bc 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/models/test/com/mbeddr/mpsutil/xml/fix/tests@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/models/test/com/mbeddr/mpsutil/xml/fix/tests@tests.mps
@@ -5,7 +5,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="a71fc24a-23c8-4871-87d3-e77b414b28d2" name="test.com.mbeddr.mpsutil.xml.fix.support" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="771359e3-76e1-4788-8a8b-4c991a9c4893" name="com.mbeddr.mpsutil.xml.fix" version="-1" />
@@ -94,7 +94,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -141,7 +141,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -157,7 +157,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/test.com.mbeddr.mpsutil.xml.fix.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/test.com.mbeddr.mpsutil.xml.fix.msd
index 1fe20fac2ed..69356f33aa1 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/test.com.mbeddr.mpsutil.xml.fix.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/test.com.mbeddr.mpsutil.xml.fix.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.mpsutil.xml.fix" uuid="6d3c26cb-5a54-45af-9595-ca1921bdbf09" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.com.mbeddr.mpsutil.xml.fix" uuid="6d3c26cb-5a54-45af-9595-ca1921bdbf09" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
@@ -25,7 +24,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:dcb5a83a-19a8-44ff-a4cb-fc7d324ecc63:jetbrains.mps.core.xml.sax" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/models/test/ts/javainterpreter/test@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/models/test/ts/javainterpreter/test@tests.mps
index 313a1adda71..0987e4546b2 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/models/test/ts/javainterpreter/test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/models/test/ts/javainterpreter/test@tests.mps
@@ -19,7 +19,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400486526326" name="jetbrains.mps.lang.test.structure.WarningStatementReference" flags="ng" index="2PQEqo" />
@@ -110,7 +110,7 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,7 +124,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -145,7 +145,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/test.ts.javainterpreter.msd b/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/test.ts.javainterpreter.msd
index ddf4b0fc0ce..d4207b3e90e 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/test.ts.javainterpreter.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.javainterpreter/test.ts.javainterpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.javainterpreter" uuid="c69d41ac-d672-4068-b5a5-b892873f6bb9" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.javainterpreter" uuid="c69d41ac-d672-4068-b5a5-b892873f6bb9" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/editor.mps
index 7456d62bc3f..40e40aba3ed 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/editor.mps
@@ -45,7 +45,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/structure.mps
index 266835fedbd..b16dd374b57 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/languageModels/structure.mps
@@ -32,7 +32,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl
index 4e2821b3aa8..2500197c0e5 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/editor.mps
index 08e68137d31..238320ef584 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/editor.mps
@@ -30,7 +30,7 @@
       <concept id="2510545900188223991" name="com.mbeddr.mpsutil.multilingual.editor.structure.MultilingualConstant" flags="ng" index="3ZRKB6" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -43,7 +43,7 @@
         <property id="568377005202317272" name="default" index="3MtHw7" />
         <property id="568377005202317271" name="technicalKey" index="3MtHw8" />
       </concept>
-      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
+      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
         <reference id="2510545900188083932" name="key" index="3ZOmrH" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/structure.mps
index d4398428e98..260c2ea74f7 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/languageModels/structure.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/test.ts.mpsutil.multilingual.editor.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/test.ts.mpsutil.multilingual.editor.sandbox.mpl
index 6e9cca95074..270bbe3d256 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/test.ts.mpsutil.multilingual.editor.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.editor.sandbox/test.ts.mpsutil.multilingual.editor.sandbox.mpl
@@ -11,20 +11,17 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/resources/test.ts.mpsutil.multilingual.editor.sandbox.resources.jar" />
     </facet>
   </facets>
   <accessoryModels />
-  <stubModelEntries>
-    <stubModelEntry path="${module}/resources/test.ts.mpsutil.multilingual.editor.sandbox.resources.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <languageVersions>
     <language slang="l:23f985f2-965f-4af1-aee8-a32677429514:com.mbeddr.mpsutil.multilingual.common" version="0" />
     <language slang="l:13a9e567-3b9e-4ccf-b94c-9155f5e78586:com.mbeddr.mpsutil.multilingual.editor" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/baseLanguage@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/baseLanguage@tests.mps
index 5b5c49f9113..b424f0795d7 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/baseLanguage@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/baseLanguage@tests.mps
@@ -29,7 +29,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -106,7 +106,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -175,7 +175,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -188,7 +188,7 @@
         <property id="568377005202317272" name="default" index="3MtHw7" />
         <property id="568377005202317271" name="technicalKey" index="3MtHw8" />
       </concept>
-      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
+      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
         <reference id="2510545900188083932" name="key" index="3ZOmrH" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common/otherModel@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common/otherModel@tests.mps
index 2ccbac6cfd3..c8b4e3b4ca8 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common/otherModel@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common/otherModel@tests.mps
@@ -8,7 +8,7 @@
   <imports />
   <registry>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common@tests.mps
index bb8650c576e..b24244829f9 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/common@tests.mps
@@ -5,7 +5,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="23f985f2-965f-4af1-aee8-a32677429514" name="com.mbeddr.mpsutil.multilingual.common" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="d2a1d976-43a2-462f-ac3a-9b258ced839d" name="com.mbeddr.mpsutil.multilingual.baseLanguage" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -29,7 +29,7 @@
       <concept id="1215603922101" name="jetbrains.mps.lang.test.structure.NodeOperationsContainer" flags="ng" index="7CXmI">
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400486526326" name="jetbrains.mps.lang.test.structure.WarningStatementReference" flags="ng" index="2PQEqo" />
@@ -94,7 +94,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -104,6 +104,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -127,7 +128,7 @@
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
-      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
         <child id="1172075534298" name="message" index="3_9lra" />
       </concept>
     </language>
@@ -150,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -164,7 +165,7 @@
         <property id="568377005202317272" name="default" index="3MtHw7" />
         <property id="568377005202317271" name="technicalKey" index="3MtHw8" />
       </concept>
-      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
+      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
         <reference id="2510545900188083932" name="key" index="3ZOmrH" />
       </concept>
     </language>
@@ -172,7 +173,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -845,7 +845,7 @@
                     <node concept="17R0WA" id="2GRHOLIM41K" role="3clFbG">
                       <node concept="2OqwBi" id="2GRHOLIM3oK" role="3uHU7B">
                         <node concept="37vLTw" id="2GRHOLIM3lA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2GRHOLIM3i4" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2La" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="2GRHOLIM3AQ" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -857,9 +857,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2GRHOLIM3i4" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2La" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2GRHOLIM3i5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Lb" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -912,7 +912,7 @@
                       </node>
                       <node concept="2OqwBi" id="2GRHOLIM4Sr" role="3uHU7B">
                         <node concept="37vLTw" id="2GRHOLIM4Ss" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2GRHOLIM4Su" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Lc" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="2GRHOLIM4St" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -921,9 +921,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2GRHOLIM4Su" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Lc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2GRHOLIM4Sv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Ld" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -974,7 +974,7 @@
                       </node>
                       <node concept="2OqwBi" id="2GRHOLIM5r2" role="3uHU7B">
                         <node concept="37vLTw" id="2GRHOLIM5r3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2GRHOLIM5r5" resolve="it" />
+                          <ref role="3cqZAo" node="2SR9xrsN2Le" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="2GRHOLIM5r4" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -983,9 +983,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2GRHOLIM5r5" role="1bW2Oz">
+                <node concept="gl6BB" id="2SR9xrsN2Le" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2GRHOLIM5r6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2SR9xrsN2Lf" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/concept@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/concept@tests.mps
index b773293f68c..61a5c2a5962 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/concept@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/models/test/ts/mpsutil/multilingual/concept@tests.mps
@@ -74,7 +74,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -83,10 +83,10 @@
       </concept>
     </language>
     <language id="d0fe2e60-9f9c-4d3c-94aa-de9257b67a6d" name="com.mbeddr.mpsutil.multilingual.concept">
-      <concept id="3125250773681831972" name="com.mbeddr.mpsutil.multilingual.concept.structure.ITranslation" flags="ng" index="s3hWx">
+      <concept id="3125250773681831972" name="com.mbeddr.mpsutil.multilingual.concept.structure.ITranslation" flags="ngI" index="s3hWx">
         <reference id="3125250773681852290" name="language" index="s3l27" />
       </concept>
-      <concept id="3125250773681852549" name="com.mbeddr.mpsutil.multilingual.concept.structure.IMultilingualContent" flags="ng" index="s3kY0">
+      <concept id="3125250773681852549" name="com.mbeddr.mpsutil.multilingual.concept.structure.IMultilingualContent" flags="ngI" index="s3kY0">
         <property id="3125250773681852552" name="showTranslations" index="s3kYd" />
         <child id="3125250773681852557" name="values" index="s3kY8" />
       </concept>
@@ -94,7 +94,7 @@
       <concept id="2510545900187060757" name="com.mbeddr.mpsutil.multilingual.concept.structure.StringTranslation" flags="ng" index="3Y8sC$">
         <property id="2510545900187060759" name="value" index="3Y8sCA" />
       </concept>
-      <concept id="2510545900187060765" name="com.mbeddr.mpsutil.multilingual.concept.structure.IMultilingualNamedConcept" flags="ng" index="3Y8sCG">
+      <concept id="2510545900187060765" name="com.mbeddr.mpsutil.multilingual.concept.structure.IMultilingualNamedConcept" flags="ngI" index="3Y8sCG">
         <child id="2510545900187060766" name="multiName" index="3Y8sCJ" />
       </concept>
     </language>
@@ -123,7 +123,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd
index aac4700899a..41148fea8d0 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.mpsutil.multilingual" uuid="fcca86e0-64c4-4aef-824c-434589a89382" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="test.ts.mpsutil.multilingual" uuid="fcca86e0-64c4-4aef-824c-434589a89382" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,13 +11,10 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/resources/test.ts.mpsutil.multilingual.resources.jar" />
     </facet>
     <facet type="tests" />
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/resources/test.ts.mpsutil.multilingual.resources.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d2a1d976-43a2-462f-ac3a-9b258ced839d(com.mbeddr.mpsutil.multilingual.baseLanguage)</dependency>
@@ -35,7 +32,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/constraints.mps
index 7187f9e45ab..6b1d01ec0e5 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/constraints.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="3f41734b-72c3-42c8-b22c-bacd5a878e17" name="com.mbeddr.mpsutil.propertydefault">
-      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ng" index="3_egWj">
+      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ngI" index="3_egWj">
         <child id="1550432487216060794" name="defaultValue" index="3_eitr" />
       </concept>
       <concept id="1550432487216062719" name="com.mbeddr.mpsutil.propertydefault.structure.NodePropertyConstraintDefault" flags="ng" index="3_ehVu" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/structure.mps
index e954d64bc40..acae5ec1d90 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/languageModels/structure.mps
@@ -23,7 +23,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/test.ts.propertydefault.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/test.ts.propertydefault.mpl
index d78ef2ebbf1..b1d329bb3e7 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/test.ts.propertydefault.mpl
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefault/test.ts.propertydefault.mpl
@@ -11,13 +11,12 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:3f41734b-72c3-42c8-b22c-bacd5a878e17:com.mbeddr.mpsutil.propertydefault" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/instancetest@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/instancetest@tests.mps
index 6c5d46baf80..93534093c3f 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/instancetest@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/instancetest@tests.mps
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/langtest@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/langtest@tests.mps
index 681887cde22..61081677bd4 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/langtest@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/models/test/ts/propertydefaulttest/langtest@tests.mps
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="3f41734b-72c3-42c8-b22c-bacd5a878e17" name="com.mbeddr.mpsutil.propertydefault">
-      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ng" index="3_egWj">
+      <concept id="1550432487216066866" name="com.mbeddr.mpsutil.propertydefault.structure.IPropertyDefaultValue" flags="ngI" index="3_egWj">
         <child id="1550432487216060794" name="defaultValue" index="3_eitr" />
       </concept>
       <concept id="1550432487216062719" name="com.mbeddr.mpsutil.propertydefault.structure.NodePropertyConstraintDefault" flags="ng" index="3_ehVu" />
@@ -63,7 +63,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/test.ts.propertydefaulttest.msd b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/test.ts.propertydefaulttest.msd
index 8dcc0a74a60..9baa41e1965 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/test.ts.propertydefaulttest.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.propertydefaulttest/test.ts.propertydefaulttest.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.propertydefaulttest" uuid="dff62b6d-9134-45e3-8451-8287afc43e99" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.propertydefaulttest" uuid="dff62b6d-9134-45e3-8451-8287afc43e99" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2720ea68-b58e-4435-aab0-4659362f72b6(test.ts.propertydefault)</dependency>
   </dependencies>
@@ -20,7 +19,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/models/test/ts/richstring/model@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/models/test/ts/richstring/model@tests.mps
index 2ea332ba7a7..91c4111c901 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/models/test/ts/richstring/model@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/models/test/ts/richstring/model@tests.mps
@@ -24,7 +24,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400486526326" name="jetbrains.mps.lang.test.structure.WarningStatementReference" flags="ng" index="2PQEqo" />
@@ -132,7 +132,7 @@
       <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -148,7 +148,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -262,7 +262,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/test.ts.richstring.msd b/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/test.ts.richstring.msd
index b15247ba2b2..2f3143afaf0 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/test.ts.richstring.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.richstring/test.ts.richstring.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.richstring" uuid="9dc1a5e9-95eb-4eda-9aa7-fa55c4ee8c31" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.richstring" uuid="9dc1a5e9-95eb-4eda-9aa7-fa55c4ee8c31" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/models/tests.com.mbeddr.mpsutil.json.tests@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/models/tests.com.mbeddr.mpsutil.json.tests@tests.mps
index d0368ae49f1..ef3f2025b94 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/models/tests.com.mbeddr.mpsutil.json.tests@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/models/tests.com.mbeddr.mpsutil.json.tests@tests.mps
@@ -63,7 +63,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -107,7 +107,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/tests.com.mbeddr.mpsutil.json.msd b/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/tests.com.mbeddr.mpsutil.json.msd
index 91fd69519bd..43d757dbae9 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/tests.com.mbeddr.mpsutil.json.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/tests.com.mbeddr.mpsutil.json/tests.com.mbeddr.mpsutil.json.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="tests.com.mbeddr.mpsutil.json" uuid="eecef0a3-bfbc-410d-af24-791863c19f80" moduleVersion="0" compileInMPS="true">
+<solution name="tests.com.mbeddr.mpsutil.json" uuid="eecef0a3-bfbc-410d-af24-791863c19f80" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">b5c0bb04-c583-4b2a-a66e-1eab92d33c68(com.mbeddr.mpsutil.json)</dependency>
@@ -23,7 +22,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.xmodel/.mps/migration.xml b/code/languages/com.mbeddr.xmodel/.mps/migration.xml
index 032befbfc32..64a93943bdc 100644
--- a/code/languages/com.mbeddr.xmodel/.mps/migration.xml
+++ b/code/languages/com.mbeddr.xmodel/.mps/migration.xml
@@ -13,6 +13,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd
index ed9dca2fc28..e911791fd1a 100644
--- a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.xmodel.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.xmodel.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.xmodel.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#com.mbeddr.xmodel.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l: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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/models/com.mbeddr.xmodel.__spreferences.PlatformTemplates.mps b/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/models/com.mbeddr.xmodel.__spreferences.PlatformTemplates.mps
index 9efcbfa08b8..aad8dc03c0d 100644
--- a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/models/com.mbeddr.xmodel.__spreferences.PlatformTemplates.mps
+++ b/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/models/com.mbeddr.xmodel.__spreferences.PlatformTemplates.mps
@@ -22,12 +22,12 @@
         <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/module.msd
index 1525145ef29..0a04695b99e 100644
--- a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/module.msd
+++ b/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.xmodel.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.xmodel.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.xmodel.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#com.mbeddr.xmodel.__spreferences.PlatformTemplates" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
@@ -28,7 +27,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/module.msd
index f728572e26c..f6c85bb2bc4 100644
--- a/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/module.msd
+++ b/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.xmodel.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.xmodel.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.xmodel.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#com.mbeddr.xmodel.__spreferences.TypeSizeConfiguration" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
@@ -22,7 +21,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
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 8ae8d0bcbc3..5f5b02e3abd 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.xmodel.plan" uuid="ba2ac496-8745-40ba-babe-060b0c8daaad" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.xmodel.plan" uuid="ba2ac496-8745-40ba-babe-060b0c8daaad" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,14 +10,13 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l: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" />
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 03283850c4c..ff4d70e0e6f 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
@@ -2,8 +2,8 @@
 <model ref="r:8bed4b02-7437-49bf-bfa1-4f220b72fa26(com.mbeddr.xmodel.plan.genplan)">
   <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.itemis.mps.hacks.xmodelgen" version="0" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
+    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.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" />
@@ -36,6 +36,9 @@
   </imports>
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
+      <concept id="1152961914448136207" name="jetbrains.mps.lang.generator.plan.structure.LanguageEntry" flags="ng" index="2Qf6Nf">
+        <child id="1152961914448136208" name="language" index="2Qf6Ng" />
+      </concept>
       <concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
         <child id="1820634577908471815" name="steps" index="2VgMA7" />
       </concept>
@@ -43,7 +46,7 @@
         <child id="3750601816081740498" name="cpSpec" index="3ps6aC" />
       </concept>
       <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
-        <child id="2944629966652439181" name="languages" index="1t_9vn" />
+        <child id="1152961914448142326" name="entries" index="2Qf7GQ" />
       </concept>
       <concept id="3750601816081736033" name="jetbrains.mps.lang.generator.plan.structure.InPlaceCheckpointSpec" flags="ng" index="3ps74r" />
     </language>
@@ -65,34 +68,44 @@
   <node concept="2VgMpV" id="3jTGQV$9VwA">
     <property role="TrG5h" value="allMbeddrPlan" />
     <node concept="2Pg1uL" id="3jTGQV$9VwB" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwC" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwD" role="3VlUeB">
         <ref role="3Vl8EH" to="8r34:35NyAcOx3U" resolve="removeCommentedAndEmptyCode" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1lV" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwC" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwE" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwF" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwG" role="3VlUeB">
         <ref role="3Vl8EH" to="e8dq:2SFcQFXcTFp" resolve="addUnitTestModulesToBuildConfig" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1lW" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwF" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwH" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwI" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwJ" role="3VlUeB">
         <ref role="3Vl8EH" to="8r34:15x2XTK8gPb" resolve="gatherApplicableModules" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1lX" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwI" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwK" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwL" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwM" role="3VlUeB">
         <ref role="3Vl8EH" to="gx1z:2fGuOSYaPra" resolve="resolveIncludes" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1lY" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwL" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwN" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwO" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwP" role="3VlUeB">
         <ref role="3Vl8EH" to="xv6j:34d3$NxWTCT" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1lZ" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwO" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2VgMA1" id="3jTGQV$9YeT" role="2VgMA7">
       <node concept="3ps74r" id="3jTGQV$9Yke" role="3ps6aC">
@@ -100,73 +113,95 @@
       </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwQ" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwR" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwS" role="3VlUeB">
         <ref role="3Vl8EH" to="gx1z:2fGuOSYcE30" resolve="renderVisualizations" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m0" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwR" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwT" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwU" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwV" role="3VlUeB">
         <ref role="3Vl8EH" to="tpd7:25idkGdmlTQ" resolve="attributes" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m1" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwU" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwW" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VwX" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VwY" role="3VlUeB">
         <ref role="3Vl8EH" to="74i7:4o0SVox6rTq" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m2" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VwX" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VwZ" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vx0" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vx1" role="3VlUeB">
         <ref role="3Vl8EH" to="w5so:5DBke2vww9n" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m3" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vx0" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vx2" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vx3" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vx4" role="3VlUeB">
         <ref role="3Vl8EH" to="h6ut:3ZdGyCQXLqr" resolve="highPrioStuff" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m4" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vx3" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vx5" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vx6" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vx7" role="3VlUeB">
         <ref role="3Vl8EH" to="x9lp:4zqPC3awLLX" resolve="replacePlatformReference" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m5" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vx6" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vx8" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vx9" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vxa" role="3VlUeB">
         <ref role="3Vl8EH" to="p4cr:u0cWm_Y3O8" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m6" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vx9" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vxb" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vxc" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vxd" role="3VlUeB">
         <ref role="3Vl8EH" to="7ynn:4rtqL27$CDg" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m7" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vxc" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vxk" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vxl" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vxm" role="3VlUeB">
         <ref role="3Vl8EH" to="xloc:1Rr52SX$6pN" resolve="mockStuff" />
       </node>
       <node concept="3Vl8EG" id="3jTGQV$9Vxn" role="3VlUeB">
         <ref role="3Vl8EH" to="xloc:5u7uvg8qRpZ" resolve="stubStuff" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m8" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vxl" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vxo" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vxp" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vxq" role="3VlUeB">
         <ref role="3Vl8EH" to="qopy:3ejBUtVm4dN" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1m9" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vxp" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vxx" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vxy" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vxz" role="3VlUeB">
         <ref role="3Vl8EH" to="cjn1:5oFMniD58l_" resolve="ppc" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1ma" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vxy" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2VgMA1" id="3jTGQV$9XYT" role="2VgMA7">
       <node concept="3ps74r" id="3jTGQV$9Y4m" role="3ps6aC">
@@ -174,22 +209,28 @@
       </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vx$" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vx_" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VxA" role="3VlUeB">
         <ref role="3Vl8EH" to="ol92:41KMvfcgcBH" resolve="statemachineTest2C" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mb" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vx_" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VxH" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VxI" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VxJ" role="3VlUeB">
         <ref role="3Vl8EH" to="cjn1:71UKpntpF$T" resolve="prepareComponentTransformation" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mc" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VxI" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VxK" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VxL" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VxM" role="3VlUeB">
         <ref role="3Vl8EH" to="ol92:7kKaL9x5gmu" resolve="statemachine2C" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1md" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VxL" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2VgMA1" id="3jTGQV$9XO3" role="2VgMA7">
       <node concept="3ps74r" id="3jTGQV$9XTs" role="3ps6aC">
@@ -197,7 +238,6 @@
       </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vyf" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vyg" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vyh" role="3VlUeB">
         <ref role="3Vl8EH" to="e8dq:5so5TTr6V0z" resolve="main" />
       </node>
@@ -207,6 +247,9 @@
       <node concept="3Vl8EG" id="3jTGQV$9Vyj" role="3VlUeB">
         <ref role="3Vl8EH" to="wwzj:78Ts1skpCaE" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1me" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vyg" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2VgMA1" id="3jTGQV$9XDl" role="2VgMA7">
       <node concept="3ps74r" id="3jTGQV$9XIE" role="3ps6aC">
@@ -214,22 +257,25 @@
       </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vyq" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vyr" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vys" role="3VlUeB">
         <ref role="3Vl8EH" to="2gc5:PWcNB4VuTz" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mf" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vyr" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VyJ" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VyK" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VyL" role="3VlUeB">
         <ref role="3Vl8EH" to="nfik:kOmZ6sYUph" resolve="genStructPrintFunction" />
       </node>
       <node concept="3Vl8EG" id="3jTGQV$9VyM" role="3VlUeB">
         <ref role="3Vl8EH" to="nfik:7ISt5c3xPE6" resolve="addReturnToClosure" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mg" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VyK" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VyQ" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VyR" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VyS" role="3VlUeB">
         <ref role="3Vl8EH" to="nfik:1x_Jrt9Ni6Q" resolve="closures" />
       </node>
@@ -248,9 +294,11 @@
       <node concept="3Vl8EG" id="3jTGQV$9VyX" role="3VlUeB">
         <ref role="3Vl8EH" to="nfik:1M41OHs97hn" resolve="datalogger_printfImmediately" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mh" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VyR" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vz1" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vz2" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vz3" role="3VlUeB">
         <ref role="3Vl8EH" to="nfik:2EBw14y27A4" resolve="withStatement" />
       </node>
@@ -305,45 +353,59 @@
       <node concept="3Vl8EG" id="3jTGQV$9Vzk" role="3VlUeB">
         <ref role="3Vl8EH" to="nfik:gaSsNUZMa9" resolve="stack" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mi" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vz2" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vzl" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vzm" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vzn" role="3VlUeB">
         <ref role="3Vl8EH" to="7cdw:7H6_Qip5BTe" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mj" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vzm" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vzo" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9Vzp" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9Vzq" role="3VlUeB">
         <ref role="3Vl8EH" to="eyis:6Fg1ERkOkVz" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mk" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9Vzp" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9Vz_" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VzA" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VzB" role="3VlUeB">
         <ref role="3Vl8EH" to="z355:7uQ0U6uwMN7" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1ml" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VzA" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VzC" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VzD" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VzE" role="3VlUeB">
         <ref role="3Vl8EH" to="x9lp:4qSf1u20j2i" resolve="runConfigItemPreprocessors" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mm" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VzD" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VzF" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VzG" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VzH" role="3VlUeB">
         <ref role="3Vl8EH" to="a4by:1x_Jrt9Ni6Q" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mn" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VzG" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VzI" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VzJ" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VzK" role="3VlUeB">
         <ref role="3Vl8EH" to="gx1z:3RseghId8Of" resolve="docGenMain" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mo" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VzJ" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9VzO" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9VzP" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9VzQ" role="3VlUeB">
         <ref role="3Vl8EH" to="h6ut:7uQ0U6uwjjR" resolve="lowPrioStuff" />
       </node>
@@ -356,6 +418,9 @@
       <node concept="3Vl8EG" id="3jTGQV$9VzT" role="3VlUeB">
         <ref role="3Vl8EH" to="x9lp:otWcsA_e$f" resolve="nothing" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mp" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9VzP" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2VgMA1" id="3jTGQV$9XeY" role="2VgMA7">
       <node concept="3ps74r" id="3jTGQV$9Xkf" role="3ps6aC">
@@ -363,34 +428,44 @@
       </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9V$b" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9V$c" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9V$d" role="3VlUeB">
         <ref role="3Vl8EH" to="9zqb:bzEfeAYKTO" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mq" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9V$c" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9V$e" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9V$f" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9V$g" role="3VlUeB">
         <ref role="3Vl8EH" to="28ud:4VxFbWczCTr" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mr" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9V$f" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9V$h" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9V$i" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9V$j" role="3VlUeB">
         <ref role="3Vl8EH" to="8ztd:7ya9dtegX_R" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1ms" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9V$i" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9V$k" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9V$l" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9V$m" role="3VlUeB">
         <ref role="3Vl8EH" to="55ds:3WQPxwFOefW" resolve="dummy" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mt" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9V$l" role="2Qf6Ng" />
+      </node>
     </node>
     <node concept="2Pg1uL" id="3jTGQV$9V$t" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9V$u" role="1t_9vn" />
       <node concept="3Vl8EG" id="3jTGQV$9V$v" role="3VlUeB">
         <ref role="3Vl8EH" to="jao2:7lmVLrULBFH" resolve="main" />
       </node>
+      <node concept="2Qf6Nf" id="2SR9xrsN1mu" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="3jTGQV$9V$u" role="2Qf6Ng" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/com.mbeddr.xmodel.tests.msd b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/com.mbeddr.xmodel.tests.msd
index afbdac9d832..82ca8304269 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/com.mbeddr.xmodel.tests.msd
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/com.mbeddr.xmodel.tests.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.xmodel.tests" uuid="1d0d71e8-791e-42d4-80dd-0310f22fc889" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.xmodel.tests" uuid="1d0d71e8-791e-42d4-80dd-0310f22fc889" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ba2ac496-8745-40ba-babe-060b0c8daaad(com.mbeddr.xmodel.plan)</dependency>
   </dependencies>
@@ -51,7 +50,7 @@
     <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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" />
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.lib.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.lib.mps
index 4ed1661be8e..a02d5b47b31 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.lib.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.lib.mps
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -47,14 +47,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -64,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -96,14 +96,14 @@
       <concept id="2103658896110121032" name="com.mbeddr.ext.components.structure.ComponentsConfigItem" flags="ng" index="3i2$bm">
         <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
       </concept>
-      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ng" index="1ZwTiz">
+      <concept id="4514118643321588318" name="com.mbeddr.ext.components.structure.IOperationTriggerLike" flags="ngI" index="1ZwTiz">
         <reference id="4514118643321619583" name="calledOperation" index="1ZwxE2" />
         <reference id="4514118643321592184" name="providedPort" index="1ZwSu5" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
       <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.user.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.user.mps
index 8111608a659..aef8562d9de 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.user.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.user.mps
@@ -40,7 +40,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -76,7 +76,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
@@ -98,7 +98,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -144,7 +144,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.lib.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.lib.mps
index e50bcfd2a50..db8106a61db 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.lib.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.lib.mps
@@ -16,14 +16,14 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -35,7 +35,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -43,7 +43,7 @@
       <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
       <concept id="8463282783691618435" name="com.mbeddr.core.expressions.structure.Int16tType" flags="ng" index="26Vqpq" />
       <concept id="5763383285156373013" name="com.mbeddr.core.expressions.structure.PlusExpression" flags="ng" index="2BOciq" />
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.user.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.user.mps
index f03e55ec193..2888c8a1e51 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.user.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.user.mps
@@ -12,7 +12,7 @@
   </imports>
   <registry>
     <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">
+      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ngI" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
@@ -45,7 +45,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -65,7 +65,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -76,7 +76,7 @@
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
       </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
+      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ngI" index="2H9T1B">
         <child id="5708867820623310661" name="arguments" index="1UOdpc" />
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
@@ -84,7 +84,7 @@
         <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
       <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
@@ -110,7 +110,7 @@
       <concept id="6847490852670653132" name="com.mbeddr.core.embedded.structure.EmulatedRegisterKind" flags="ng" index="3VbeTE" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -124,7 +124,7 @@
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
       </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.lib.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.lib.mps
index 082e7322b84..3d81ae57e5e 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.lib.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.lib.mps
@@ -22,7 +22,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
@@ -31,7 +31,7 @@
         <child id="6437088627575722833" name="contents" index="N3F5h" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
+      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ngI" index="N3F5f">
         <property id="1317894735999272944" name="exported" index="2OOxQR" />
       </concept>
     </language>
@@ -45,12 +45,12 @@
       <concept id="8610007178384196427" name="com.mbeddr.core.unittest.structure.UnitTestConfigItem" flags="ng" index="12mU2y" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
+      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ngI" index="2C2TGh">
         <child id="318113533128716676" name="type" index="2C2TGm" />
       </concept>
       <concept id="7892328519581699353" name="com.mbeddr.core.expressions.structure.VoidType" flags="ng" index="19Rifw" />
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.user.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.user.mps
index ed0e793f49a..f656cc26cee 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.user.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.user.mps
@@ -36,7 +36,7 @@
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
       </concept>
       <concept id="5476261277774503065" name="com.mbeddr.core.buildconfig.structure.Any" flags="ng" index="1l1$C7" />
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ngI" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
       </concept>
     </language>
@@ -52,7 +52,7 @@
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
+      <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
       <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
@@ -87,7 +87,7 @@
       <concept id="6847490852670653132" name="com.mbeddr.core.embedded.structure.EmulatedRegisterKind" flags="ng" index="3VbeTE" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/generator/template/main@generator.mps b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/generator/template/main@generator.mps
index c43e24a6577..3d515356318 100644
--- a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/generator/template/main@generator.mps
+++ b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/generator/template/main@generator.mps
@@ -13,7 +13,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/plugin.mps b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/plugin.mps
index 457ad5953e9..a3f1fbc4fbf 100644
--- a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/plugin.mps
+++ b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:d423ef6c-a57c-42f7-80c9-637c75cb7586(test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="9ee3d5d2-5388-460b-b1dc-d98f27db499b" name="com.mbeddr.mpsutil.postprocessGeneratedFiles" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
@@ -58,7 +58,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -99,7 +99,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/structure.mps b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/structure.mps
index 92f9f078184..44cf706e324 100644
--- a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/structure.mps
+++ b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/models/structure.mps
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl
index 6eaa6555602..034e2836a84 100644
--- a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl
+++ b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -52,14 +52,13 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:9ee3d5d2-5388-460b-b1dc-d98f27db499b:com.mbeddr.mpsutil.postprocessGeneratedFiles" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -78,7 +77,7 @@
     <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/tools/BigProject/.mps/migration.xml b/tools/BigProject/.mps/migration.xml
index 1c00245e03c..d62e30e5767 100644
--- a/tools/BigProject/.mps/migration.xml
+++ b/tools/BigProject/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file