diff --git a/build.gradle b/build.gradle
index c6aafc6b..ac8c9b33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
 
 apply plugin: 'download-jbr'
 
-ext.jbrVers = '17.0.3-b469.32'
+ext.jbrVers = '17.0.8.1-b1000.32'
 
 downloadJbr {
     jbrVersion = jbrVers
@@ -57,11 +57,11 @@ ext.dependencyRepositories = [
 ]
 
 // Dependency versions
-ext.mpsVersion =  '2022.3'
+ext.mpsVersion =  '2023.2'
 
 // Project versions
-ext.major = '2022'
-ext.minor = '3'
+ext.major = '2023'
+ext.minor = '2'
 
 if (ciBuild) {
     String branch = GitBasedVersioning.gitBranch
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 4b38a20b..3c054f7a 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -3,7 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/org.mpsqa.allScripts" />
   <property name="build.layout" location="${build.dir}/artifacts/org.mpsqa.allScripts" />
-  <property name="mps.home" location="${basedir}/../../../MPS_2020_3_5" />
+  <property name="mps.home" location="" />
   <property name="mpsqa.home" location="${basedir}/../.." />
   <property name="mpsqa.build.home" location="${mpsqa.home}/code/languages/org.mpsqa.build" />
   <property name="artifacts.mps" location="${mps.home}" />
@@ -28,7 +28,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>
   
@@ -206,6 +206,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" />
diff --git a/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml b/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
+++ b/code/applications/org.mpsqa.clones.demo/code/.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
diff --git a/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml b/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
index e25a9f81..4fce1d86 100644
--- a/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
+++ b/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$mpsqa.home$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
index 5b723a8a..fa00f2d1 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
@@ -9,6 +9,8 @@
   <imports>
     <import index="c9zv" ref="r:c9eae771-f543-4d3e-89a7-0f86ee2dae52(org.mpsqa.clones.build)" />
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
+    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.build._010_base_build)" />
+    <import index="5g2w" ref="r:eecfcc09-6fb4-4fd4-bb99-b3d1712ec5a4(org.mpsqa.build._030_clones_build)" implicit="true" />
   </imports>
   <registry>
     <language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
@@ -60,7 +62,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 +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>
@@ -109,6 +111,12 @@
       <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
         <child id="763829979718664967" name="files" index="3rtmxm" />
       </concept>
+      <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
+        <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
+        <property id="8137134783396676838" name="extracted" index="1HemKv" />
+        <property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
+        <child id="8137134783396676835" name="location" index="1HemKq" />
+      </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA">
         <property id="269707337715731330" name="sourcesKind" index="aoJFB" />
       </concept>
@@ -152,7 +160,7 @@
         <ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
       </node>
       <node concept="m$_yC" id="1GhTetdABhp" role="m$_yJ">
-        <ref role="m$_y1" to="c9zv:2JVMSZMFXh0" resolve="org.mpsqa.clones" />
+        <ref role="m$_y1" to="5g2w:2JVMSZMFXh0" resolve="org.mpsqa.clones" />
       </node>
       <node concept="3_J27D" id="2JVMSZMFY9r" role="m_cZH">
         <node concept="3Mxwew" id="2JVMSZMFY9s" role="3MwsjC">
@@ -166,7 +174,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="org.mpsqa.clones.demo.config" />
         <property role="3LESm3" value="c234a129-76f4-4c3c-8e00-1d5d820ac2f6" />
-        <property role="aoJFB" value="sources and tests" />
+        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
         <node concept="3rtmxn" id="1GhTetdABhv" role="3bR31x">
           <node concept="3LXTmp" id="1GhTetdABhw" role="3rtmxm">
             <node concept="398BVA" id="1GhTetdABhx" role="3LXTmr">
@@ -203,7 +211,7 @@
         </node>
         <node concept="1SiIV0" id="6dJ4vxiUcX$" role="3bR37C">
           <node concept="3bR9La" id="6dJ4vxiUcX_" role="1SiIV1">
-            <ref role="3bR37D" to="c9zv:2JVMSZMFXgA" resolve="org.mpsqa.clones.core" />
+            <ref role="3bR37D" to="5g2w:2JVMSZMFXgA" resolve="org.mpsqa.clones.core" />
           </node>
         </node>
         <node concept="1SiIV0" id="6dJ4vxiUcXA" role="3bR37C">
@@ -218,7 +226,32 @@
         </node>
         <node concept="1SiIV0" id="6dJ4vxiUcXE" role="3bR37C">
           <node concept="3bR9La" id="6dJ4vxiUcXF" role="1SiIV1">
-            <ref role="3bR37D" to="c9zv:2JVMSZMFXgS" resolve="org.mpsqa.clones.config.pluginSolution" />
+            <ref role="3bR37D" to="5g2w:2JVMSZMFXgS" resolve="org.mpsqa.clones.config.pluginSolution" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="7j9WyvhwngV" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9WyvhwngW" role="1HemKq">
+            <node concept="398BVA" id="7j9WyvhwngL" role="3LXTmr">
+              <ref role="398BVh" node="1GhTetdB0oc" resolve="mpsqa.clones.detection.home" />
+              <node concept="2Ry0Ak" id="7j9WyvhwngM" role="iGT6I">
+                <property role="2Ry0Am" value="code" />
+                <node concept="2Ry0Ak" id="7j9WyvhwngN" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7j9WyvhwngO" role="2Ry0An">
+                    <property role="2Ry0Am" value="org.mpsqa.clones.demo.config" />
+                    <node concept="2Ry0Ak" id="7j9WyvhwngP" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9WyvhwngX" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
           </node>
         </node>
       </node>
@@ -230,39 +263,16 @@
       </node>
     </node>
     <node concept="2sgV4H" id="6dJ4vxiTR6z" role="1l3spa">
-      <ref role="1l3spb" to="c9zv:2JVMSZMFXgi" resolve="org.mpsqa.clones" />
+      <ref role="1l3spb" to="c9zv:2JVMSZMFXJP" resolve="org.mpsqa.clones.headless" />
       <node concept="398BVA" id="6dJ4vxiUhxa" role="2JcizS">
         <ref role="398BVh" node="1GhTetdB0o4" resolve="mps_home" />
       </node>
     </node>
+    <node concept="2sgV4H" id="7j9WyvhwmK6" role="1l3spa">
+      <ref role="1l3spb" to="2tou:7C9PHv6FBIG" resolve="org.mpsqa.base" />
+    </node>
     <node concept="398rNT" id="1GhTetdB0o4" role="1l3spd">
       <property role="TrG5h" value="mps_home" />
-      <node concept="55IIr" id="1GhTetdB0o5" role="398pKh">
-        <node concept="2Ry0Ak" id="1GhTetdB0o6" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="1GhTetdB0o7" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="1GhTetdB0o8" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="1GhTetdB0o9" role="2Ry0An">
-                <property role="2Ry0Am" value=".." />
-                <node concept="2Ry0Ak" id="1GhTetdBQO4" role="2Ry0An">
-                  <property role="2Ry0Am" value=".." />
-                  <node concept="2Ry0Ak" id="6dJ4vxiTQkY" role="2Ry0An">
-                    <property role="2Ry0Am" value=".." />
-                    <node concept="2Ry0Ak" id="6dJ4vxiTQxP" role="2Ry0An">
-                      <property role="2Ry0Am" value=".." />
-                      <node concept="2Ry0Ak" id="6dJ4vxiUhxf" role="2Ry0An">
-                        <property role="2Ry0Am" value="MPS_2018_3_7_esd_devel_clones_detection" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="1GhTetdB0oc" role="1l3spd">
       <property role="TrG5h" value="mpsqa.clones.detection.home" />
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
index f42a4659..7b9507e6 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.demo.build" uuid="3ef108e9-9b3a-4772-a069-c91cd62467de" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.clones.demo.build" uuid="3ef108e9-9b3a-4772-a069-c91cd62467de" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,10 +10,10 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
+    <dependency reexport="false">11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
@@ -23,6 +23,7 @@
   </languageVersions>
   <dependencyVersions>
     <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
+    <module reference="11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)" version="0" />
     <module reference="cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)" version="0" />
     <module reference="3ef108e9-9b3a-4772-a069-c91cd62467de(org.mpsqa.clones.demo.build)" version="0" />
   </dependencyVersions>
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps
index f72cdd29..15ce0c70 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.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/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@tests.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@tests.mps
index 5fd7cd62..a902a8c6 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@tests.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@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="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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -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>
@@ -106,7 +106,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" 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/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
index fffb5f99..10c524fc 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.demo.config" uuid="c234a129-76f4-4c3c-8e00-1d5d820ac2f6" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.clones.demo.config" uuid="c234a129-76f4-4c3c-8e00-1d5d820ac2f6" 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">c444eed9-4c7b-48e8-a62c-124f7b6b1712(org.mpsqa.clones.config.pluginSolution)</dependency>
     <dependency reexport="false">48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7(org.mpsqa.clones.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/org.mpsqa.arch/.mps/migration.xml b/code/languages/org.mpsqa.arch/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.arch/.mps/migration.xml
+++ b/code/languages/org.mpsqa.arch/.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
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps
index 60fe131e..a4a90bbe 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps
@@ -6,7 +6,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" 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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -105,7 +105,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 @@
         <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">
@@ -130,6 +130,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" />
@@ -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>
@@ -217,7 +218,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="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -276,7 +276,7 @@
                       <node concept="2OqwBi" id="1tkdAPw1Oo3" role="3clFbG">
                         <node concept="2OqwBi" id="1tkdAPw1Mga" role="2Oq$k0">
                           <node concept="37vLTw" id="1tkdAPw1LYH" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1tkdAPw1LRH" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkDXcjK" />
                           </node>
                           <node concept="3Tsc0h" id="1tkdAPw1M$i" role="2OqNvi">
                             <ref role="3TtcxE" to="ryx8:6MUZd5UjK7L" resolve="dependsOn" />
@@ -288,9 +288,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1tkdAPw1LRH" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkDXcjK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1tkdAPw1LRI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkDXcjL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -333,7 +333,7 @@
                           <node concept="2OqwBi" id="fm3v0WWLgQ" role="3clFbG">
                             <node concept="2OqwBi" id="fm3v0WWLgR" role="2Oq$k0">
                               <node concept="37vLTw" id="fm3v0WWLgS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="fm3v0WWLgV" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkDXcjM" />
                               </node>
                               <node concept="3Tsc0h" id="fm3v0WWLgT" role="2OqNvi">
                                 <ref role="3TtcxE" to="ryx8:6MUZd5UjK7L" resolve="dependsOn" />
@@ -345,9 +345,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="fm3v0WWLgV" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkDXcjM" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="fm3v0WWLgW" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkDXcjN" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -454,7 +454,7 @@
                       <node concept="3clFbF" id="fm3v0WWUBj" role="3cqZAp">
                         <node concept="2OqwBi" id="fm3v0WWURT" role="3clFbG">
                           <node concept="37vLTw" id="fm3v0WWUBi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="fm3v0WWUwG" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkDXcjO" />
                           </node>
                           <node concept="liA8E" id="fm3v0WWV9c" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
@@ -462,9 +462,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="fm3v0WWUwG" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkDXcjO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="fm3v0WWUwH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkDXcjP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -541,7 +541,7 @@
                         <node concept="3JPx81" id="fm3v0WXgWm" role="2OqNvi">
                           <node concept="2OqwBi" id="fm3v0WXeKY" role="25WWJ7">
                             <node concept="37vLTw" id="fm3v0WXev1" role="2Oq$k0">
-                              <ref role="3cqZAo" node="fm3v0WX6Ly" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXcjQ" />
                             </node>
                             <node concept="2qgKlT" id="fm3v0WXf5z" role="2OqNvi">
                               <ref role="37wK5l" node="fm3v0WXaPS" resolve="sourceModule" />
@@ -551,9 +551,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="fm3v0WX6Ly" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkDXcjQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="fm3v0WX6Lz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkDXcjR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -689,7 +689,7 @@
                             <node concept="2OqwBi" id="fm3v0WS4rC" role="2Oq$k0">
                               <node concept="2OqwBi" id="fm3v0WS4rD" role="2Oq$k0">
                                 <node concept="37vLTw" id="fm3v0WS4rE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="fm3v0WS4rI" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkDXcjS" />
                                 </node>
                                 <node concept="3TrEf2" id="fm3v0WS4rF" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tp25:1Bs_61$ngwB" resolve="modelRef" />
@@ -705,9 +705,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="fm3v0WS4rI" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkDXcjS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="fm3v0WS4rJ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkDXcjT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -943,7 +943,7 @@
                     <node concept="3clFbF" id="fm3v0WSpE0" role="3cqZAp">
                       <node concept="2OqwBi" id="fm3v0WSpMn" role="3clFbG">
                         <node concept="37vLTw" id="fm3v0WSpDZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="fm3v0WSp_z" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkDXcjU" />
                         </node>
                         <node concept="liA8E" id="fm3v0WSpV1" role="2OqNvi">
                           <ref role="37wK5l" to="lui2:~SDependency.getTarget()" resolve="getTarget" />
@@ -951,9 +951,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="fm3v0WSp_z" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkDXcjU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="fm3v0WSp_$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkDXcjV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1089,7 +1089,7 @@
                             <node concept="2OqwBi" id="fm3v0WTSVz" role="2Oq$k0">
                               <node concept="2OqwBi" id="fm3v0WTSV$" role="2Oq$k0">
                                 <node concept="37vLTw" id="fm3v0WTSV_" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="fm3v0WTSVD" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkDXcjW" />
                                 </node>
                                 <node concept="3TrEf2" id="fm3v0WTSVA" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tp25:1Bs_61$ngwB" resolve="modelRef" />
@@ -1105,9 +1105,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="fm3v0WTSVD" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkDXcjW" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="fm3v0WTSVE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkDXcjX" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1506,7 +1506,7 @@
                         <node concept="2OqwBi" id="10aXpfQeYAg" role="3fr31v">
                           <node concept="2OqwBi" id="10aXpfQeYAh" role="2Oq$k0">
                             <node concept="37vLTw" id="10aXpfQeYAi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="10aXpfQeYAm" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXcjY" />
                             </node>
                             <node concept="1mfA1w" id="10aXpfQeYAj" role="2OqNvi" />
                           </node>
@@ -1519,9 +1519,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="10aXpfQeYAm" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkDXcjY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="10aXpfQeYAn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkDXcjZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.mps
index e277feee..1bedc711 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.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>
@@ -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/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
index b29ce78a..8c385994 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
@@ -57,7 +57,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>
@@ -66,7 +66,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="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -100,7 +100,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_">
@@ -153,7 +153,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>
@@ -163,6 +163,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>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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,7 +206,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="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>
@@ -644,7 +644,7 @@
                           <node concept="2OqwBi" id="2p0G1uTupu9" role="3clFbG">
                             <node concept="2OqwBi" id="2p0G1uTuoSo" role="2Oq$k0">
                               <node concept="37vLTw" id="2p0G1uTuoES" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2p0G1uTuouC" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkDXck2" />
                               </node>
                               <node concept="2qgKlT" id="2p0G1uTup7i" role="2OqNvi">
                                 <ref role="37wK5l" to="vdrq:WJz9iATjyN" resolve="getTextElements" />
@@ -658,7 +658,7 @@
                                       <node concept="2OqwBi" id="2p0G1uTuroW" role="2Oq$k0">
                                         <node concept="2OqwBi" id="2p0G1uTuqgg" role="2Oq$k0">
                                           <node concept="37vLTw" id="2p0G1uTuq2g" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2p0G1uTupLb" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkDXck0" />
                                           </node>
                                           <node concept="2qgKlT" id="2p0G1uTuqRn" role="2OqNvi">
                                             <ref role="37wK5l" to="vdrq:fB3l81it7u" resolve="getTextualRepresentation" />
@@ -677,18 +677,18 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2p0G1uTupLb" role="1bW2Oz">
+                                <node concept="gl6BB" id="1vMaDkDXck0" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="2p0G1uTupLc" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="1vMaDkDXck1" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2p0G1uTuouC" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkDXck2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2p0G1uTuouD" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkDXck3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
index a86ed3b1..d0e0f6dd 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.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>
@@ -99,6 +99,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="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>
@@ -173,7 +174,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" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -256,7 +256,7 @@
                         <node concept="2OqwBi" id="4rmIzFjf1gB" role="2Oq$k0">
                           <node concept="2OqwBi" id="4rmIzFjeXAB" role="2Oq$k0">
                             <node concept="37vLTw" id="4rmIzFjeXAC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4rmIzFjeXAE" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXck4" />
                             </node>
                             <node concept="3TrEf2" id="4rmIzFjf149" role="2OqNvi">
                               <ref role="3Tt5mk" to="tp25:1t9FffgebJ_" resolve="moduleId" />
@@ -275,9 +275,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4rmIzFjeXAE" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkDXck4" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4rmIzFjeXAF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkDXck5" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps
index 94561ee2..e76ce9c1 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.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/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps
index 14863280..8e1a988e 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.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>
@@ -114,6 +114,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" />
@@ -198,7 +199,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>
@@ -236,7 +237,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="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="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
@@ -422,7 +422,7 @@
                       <node concept="2OqwBi" id="5EbKmZ4nOoS" role="3clFbG">
                         <node concept="2OqwBi" id="5EbKmZ4nI0f" role="2Oq$k0">
                           <node concept="37vLTw" id="5EbKmZ4nI0g" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5EbKmZ4nI0i" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkDXck6" />
                           </node>
                           <node concept="3Tsc0h" id="5EbKmZ4nI0h" role="2OqNvi">
                             <ref role="3TtcxE" to="ryx8:6MUZd5UjK7L" resolve="dependsOn" />
@@ -434,9 +434,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5EbKmZ4nI0i" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkDXck6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5EbKmZ4nI0j" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkDXck7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -779,15 +779,15 @@
                               </node>
                               <node concept="3JPx81" id="58jxdNSpsY_" role="2OqNvi">
                                 <node concept="37vLTw" id="58jxdNSpsYA" role="25WWJ7">
-                                  <ref role="3cqZAo" node="58jxdNSpsYB" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkDXck8" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="58jxdNSpsYB" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkDXck8" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="58jxdNSpsYC" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkDXck9" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -941,7 +941,7 @@
                         <node concept="2OqwBi" id="6ESRMYIDa_J" role="3clFbG">
                           <node concept="2OqwBi" id="6ESRMYIDa_K" role="2Oq$k0">
                             <node concept="37vLTw" id="6ESRMYIDa_L" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6ESRMYIDa_P" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXcka" />
                             </node>
                             <node concept="3TrcHB" id="6ESRMYIDa_M" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -956,9 +956,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6ESRMYIDa_P" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkDXcka" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6ESRMYIDa_Q" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkDXckb" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1065,7 +1065,7 @@
                         <node concept="2OqwBi" id="6ESRMYIDERP" role="3clFbG">
                           <node concept="2OqwBi" id="6ESRMYIDERQ" role="2Oq$k0">
                             <node concept="37vLTw" id="6ESRMYIDERR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6ESRMYIDERV" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXckc" />
                             </node>
                             <node concept="3TrcHB" id="6ESRMYIDERS" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1080,9 +1080,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6ESRMYIDERV" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkDXckc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6ESRMYIDERW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkDXckd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1237,7 +1237,7 @@
                   <node concept="3clFbF" id="fm3v0WXElh" role="3cqZAp">
                     <node concept="2OqwBi" id="fm3v0WXEli" role="3clFbG">
                       <node concept="37vLTw" id="fm3v0WXElj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="fm3v0WXEll" resolve="it" />
+                        <ref role="3cqZAo" node="1vMaDkDXcke" />
                       </node>
                       <node concept="3TrEf2" id="fm3v0WXElk" role="2OqNvi">
                         <ref role="3Tt5mk" to="ryx8:6MUZd5Uj9wm" resolve="component" />
@@ -1245,9 +1245,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="fm3v0WXEll" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkDXcke" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="fm3v0WXElm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkDXckf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1401,7 +1401,7 @@
                           <node concept="2OqwBi" id="1KHvhQesOai" role="3clFbG">
                             <node concept="2OqwBi" id="1KHvhQesMId" role="2Oq$k0">
                               <node concept="37vLTw" id="1KHvhQesMkt" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1KHvhQesM7H" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkDXckg" />
                               </node>
                               <node concept="2Rf3mk" id="1KHvhQesN5M" role="2OqNvi">
                                 <node concept="1xMEDy" id="1KHvhQesN5O" role="1xVPHs">
@@ -1420,9 +1420,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1KHvhQesM7H" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkDXckg" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1KHvhQesM7I" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkDXckh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1814,7 +1814,7 @@
                           <node concept="3clFbF" id="5enppyYEO2N" role="3cqZAp">
                             <node concept="2OqwBi" id="5enppyYEOfg" role="3clFbG">
                               <node concept="37vLTw" id="5enppyYEO2M" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5enppyYENUk" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkDXcki" />
                               </node>
                               <node concept="liA8E" id="5enppyYEOzr" role="2OqNvi">
                                 <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -1822,9 +1822,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5enppyYENUk" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkDXcki" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5enppyYENUl" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkDXckj" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
index e719e821..d4f2fe51 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
@@ -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>
@@ -95,13 +95,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" />
@@ -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>
@@ -164,7 +165,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="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -222,7 +222,7 @@
                         <node concept="2OqwBi" id="72dZnKNhsjz" role="2Oq$k0">
                           <node concept="2OqwBi" id="72dZnKNhsj$" role="2Oq$k0">
                             <node concept="37vLTw" id="72dZnKNhsj_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="72dZnKNhsjE" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXckk" />
                             </node>
                             <node concept="3TrEf2" id="72dZnKNhsjA" role="2OqNvi">
                               <ref role="3Tt5mk" to="tp25:1t9FffgebJ_" resolve="moduleId" />
@@ -241,9 +241,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="72dZnKNhsjE" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkDXckk" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="72dZnKNhsjF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkDXckl" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
index e6ab8009..bc7dea69 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)</dependency>
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</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:73736c50-f124-433b-b789-2828a15a0adc:jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <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" />
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
deleted file mode 100644
index 25da45f9..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:6c01fb35-6d14-4bfc-a6dd-c0d4f33f54b6(test.org.mpsqa.arch.baselang.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="tz9v" ref="r:ab6dc11a-5319-44b2-894f-9eccae1e75b7(test.org.mpsqa.arch.baselang.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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="6ESRMYIDhR9">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
index a39df801..5a958a53 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
@@ -11,55 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="test.org.mpsqa.arch.baselang.generator" uuid="45226294-adfe-4ecb-ae82-fc19c7a5feaa">
-      <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>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <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" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="bcaa03af-4226-4b43-a0ed-7ecc5d6748d9(test.org.mpsqa.arch.baselang)" version="0" />
-        <module reference="45226294-adfe-4ecb-ae82-fc19c7a5feaa(test.org.mpsqa.arch.baselang.generator)" version="0" />
-      </dependencyVersions>
-      <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/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
deleted file mode 100644
index 44e6fb15..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:d3b20cac-ad7e-4c07-9314-52cc348fb9b6(test.org.mpsqa.arch.ext.ext.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="ebeo" ref="r:99cf0c8e-1774-4bf5-8f71-f8183fc8c323(test.org.mpsqa.arch.ext.ext.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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="fm3v0X0Tn_">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
index 17e91cc7..f4e257c7 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
@@ -11,55 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="test.org.mpsqa.arch.ext.ext.generator" uuid="ccf37458-7029-4d65-bf9e-a5d781557943">
-      <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>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <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" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="0777ffbf-ace4-4237-ba8d-43a217645761(test.org.mpsqa.arch.ext.ext)" version="0" />
-        <module reference="ccf37458-7029-4d65-bf9e-a5d781557943(test.org.mpsqa.arch.ext.ext.generator)" version="0" />
-      </dependencyVersions>
-      <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/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
deleted file mode 100644
index 24dfcf8c..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:6a276193-7faf-4eff-b825-2e187db1f7b5(test.org.mpsqa.arch.ext.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="q35j" ref="r:91e8ed87-94d4-4d7a-b673-f6284141d0a2(test.org.mpsqa.arch.ext.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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="6ESRMYIDijB">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
index 84f482e0..5c8a5a26 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
@@ -11,50 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="test.org.mpsqa.arch.ext.generator" uuid="3b8e07e8-51e0-4b88-b953-5a05fcf685c6">
-      <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>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <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" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="9e2430af-289d-4254-9192-096b6a0cdea0(test.org.mpsqa.arch.ext)" version="0" />
-        <module reference="3b8e07e8-51e0-4b88-b953-5a05fcf685c6(test.org.mpsqa.arch.ext.generator)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">bcaa03af-4226-4b43-a0ed-7ecc5d6748d9(test.org.mpsqa.arch.baselang)</dependency>
   </dependencies>
@@ -62,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/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
index 1b40796c..79ca31cd 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:27556261-c392-413e-ba2a-21ab61a1bc6b(org.mpsqa.arch.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="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" />
@@ -29,6 +29,7 @@
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="r791" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.text(JDK/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -67,6 +68,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" />
@@ -103,7 +105,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>
@@ -134,7 +136,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_" />
@@ -233,7 +235,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>
@@ -256,7 +258,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">
@@ -282,6 +284,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" />
@@ -293,7 +296,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" />
@@ -361,7 +364,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">
@@ -407,7 +410,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" />
@@ -420,6 +422,7 @@
   <node concept="sE7Ow" id="1tkdAPw35e4">
     <property role="TrG5h" value="OpenPlantUmlOnArchitectureSpecification" />
     <property role="2uzpH1" value="Visualize DSLs Architecture with PlantUML" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="1tkdAPw35e5" role="tncku">
       <node concept="3clFbS" id="1tkdAPw35e6" role="2VODD2">
         <node concept="3cpWs8" id="1Nl9e7Dz2vp" role="3cqZAp">
@@ -467,18 +470,33 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1Nl9e7Dzzni" role="3cqZAp">
-          <node concept="2YIFZM" id="1Nl9e7DzzrI" role="3clFbG">
-            <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
-            <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
-            <node concept="2OqwBi" id="1Nl9e7DzzIK" role="37wK5m">
-              <node concept="2WthIp" id="1Nl9e7DzzsT" role="2Oq$k0" />
-              <node concept="1DTwFV" id="1Nl9e7DzzYh" role="2OqNvi">
-                <ref role="2WH_rO" node="1tkdAPw5qGO" resolve="proj" />
-              </node>
+        <node concept="3clFbF" id="7j9WyvhatFp" role="3cqZAp">
+          <node concept="2OqwBi" id="7j9WyvhaupY" role="3clFbG">
+            <node concept="2YIFZM" id="7j9WyvhatLd" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
             </node>
-            <node concept="37vLTw" id="1Nl9e7Dz$1W" role="37wK5m">
-              <ref role="3cqZAo" node="1tkdAPw5gL_" resolve="source" />
+            <node concept="liA8E" id="7j9WyvhawCA" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="7j9WyvhawDT" role="37wK5m">
+                <node concept="3clFbS" id="7j9WyvhawDW" role="1bW5cS">
+                  <node concept="3clFbF" id="1Nl9e7Dzzni" role="3cqZAp">
+                    <node concept="2YIFZM" id="1Nl9e7DzzrI" role="3clFbG">
+                      <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
+                      <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
+                      <node concept="2OqwBi" id="1Nl9e7DzzIK" role="37wK5m">
+                        <node concept="2WthIp" id="1Nl9e7DzzsT" role="2Oq$k0" />
+                        <node concept="1DTwFV" id="1Nl9e7DzzYh" role="2OqNvi">
+                          <ref role="2WH_rO" node="1tkdAPw5qGO" resolve="proj" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="1Nl9e7Dz$1W" role="37wK5m">
+                        <ref role="3cqZAo" node="1tkdAPw5gL_" resolve="source" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -1659,7 +1677,7 @@
                       <node concept="3clFbF" id="1Nl9e7D$vgX" role="3cqZAp">
                         <node concept="2OqwBi" id="1Nl9e7D$vgY" role="3clFbG">
                           <node concept="37vLTw" id="1Nl9e7D$vgZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1Nl9e7D$vh4" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkDXckn" />
                           </node>
                           <node concept="2Rf3mk" id="1Nl9e7D$vh0" role="2OqNvi">
                             <node concept="1xMEDy" id="1Nl9e7D$vh1" role="1xVPHs">
@@ -1672,9 +1690,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1Nl9e7D$vh4" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkDXckn" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1Nl9e7D$vh5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkDXcko" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2364,7 +2382,7 @@
                         <node concept="3clFbF" id="1Nl9e7Dw7Us" role="3cqZAp">
                           <node concept="2OqwBi" id="1Nl9e7Dw8Uv" role="3clFbG">
                             <node concept="37vLTw" id="1Nl9e7Dw7Ur" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1Nl9e7Dw6wY" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXckp" />
                             </node>
                             <node concept="2qgKlT" id="1Nl9e7Dwa88" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2372,9 +2390,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1Nl9e7Dw6wY" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkDXckp" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1Nl9e7Dw6wZ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkDXckq" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2396,7 +2414,7 @@
                         <node concept="3clFbF" id="1Nl9e7Dwb2G" role="3cqZAp">
                           <node concept="2OqwBi" id="1Nl9e7Dwb2H" role="3clFbG">
                             <node concept="37vLTw" id="1Nl9e7Dwb2I" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1Nl9e7Dwb2K" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkDXckr" />
                             </node>
                             <node concept="2qgKlT" id="1Nl9e7Dwb2J" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -2404,9 +2422,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1Nl9e7Dwb2K" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkDXckr" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1Nl9e7Dwb2L" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkDXcks" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3075,6 +3093,7 @@
   <node concept="sE7Ow" id="1Nl9e7Dz$j_">
     <property role="TrG5h" value="OpenPlantUmlOnComponentDefinition" />
     <property role="2uzpH1" value="Visualize Component with PlantUML" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="1Nl9e7Dz$jA" role="tncku">
       <node concept="3clFbS" id="1Nl9e7Dz$jB" role="2VODD2">
         <node concept="3cpWs8" id="1Nl9e7Dz$jC" role="3cqZAp">
@@ -3122,18 +3141,33 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1Nl9e7Dz$jV" role="3cqZAp">
-          <node concept="2YIFZM" id="1Nl9e7Dz$jW" role="3clFbG">
-            <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
-            <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
-            <node concept="2OqwBi" id="1Nl9e7Dz$jX" role="37wK5m">
-              <node concept="2WthIp" id="1Nl9e7Dz$jY" role="2Oq$k0" />
-              <node concept="1DTwFV" id="1Nl9e7Dz$jZ" role="2OqNvi">
-                <ref role="2WH_rO" node="1Nl9e7Dz$k5" resolve="proj" />
-              </node>
+        <node concept="3clFbF" id="7j9WyvhaxaL" role="3cqZAp">
+          <node concept="2OqwBi" id="7j9WyvhaxTp" role="3clFbG">
+            <node concept="2YIFZM" id="7j9WyvhaxgC" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
             </node>
-            <node concept="37vLTw" id="1Nl9e7Dz$k0" role="37wK5m">
-              <ref role="3cqZAo" node="1Nl9e7Dz$jJ" resolve="source" />
+            <node concept="liA8E" id="7j9WyvhayuG" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="7j9WyvhayvZ" role="37wK5m">
+                <node concept="3clFbS" id="7j9Wyvhayw2" role="1bW5cS">
+                  <node concept="3clFbF" id="1Nl9e7Dz$jV" role="3cqZAp">
+                    <node concept="2YIFZM" id="1Nl9e7Dz$jW" role="3clFbG">
+                      <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
+                      <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
+                      <node concept="2OqwBi" id="1Nl9e7Dz$jX" role="37wK5m">
+                        <node concept="2WthIp" id="1Nl9e7Dz$jY" role="2Oq$k0" />
+                        <node concept="1DTwFV" id="1Nl9e7Dz$jZ" role="2OqNvi">
+                          <ref role="2WH_rO" node="1Nl9e7Dz$k5" resolve="proj" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="1Nl9e7Dz$k0" role="37wK5m">
+                        <ref role="3cqZAo" node="1Nl9e7Dz$jJ" resolve="source" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
index 6df72870..a19ed449 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.arch.pluginSolution" uuid="96212ac2-423f-4cfb-b211-b58d0546b6bf" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.mpsqa.arch.pluginSolution" uuid="96212ac2-423f-4cfb-b211-b58d0546b6bf" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -14,12 +14,9 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/plantuml-1.2022.6.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/plantuml-1.2022.6.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)</dependency>
@@ -34,13 +31,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: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/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
index fa254f45..2cc5ffaf 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.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/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
index 08a9e2b9..cf3c8caa 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.arch.sandbox" uuid="9abe2e7d-d94d-49b4-9574-c7a13413163e" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.arch.sandbox" uuid="9abe2e7d-d94d-49b4-9574-c7a13413163e" 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:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
index 89726113..1ec30ad4 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
@@ -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/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
index 05f46f30..1c471eee 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.org.mpsqa.arch" uuid="e9a9dadb-1692-4088-a9d0-5e75db05f61a" moduleVersion="0" compileInMPS="true">
+<solution name="test.org.mpsqa.arch" uuid="e9a9dadb-1692-4088-a9d0-5e75db05f61a" 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:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/org.mpsqa.base/.mps/migration.xml b/code/languages/org.mpsqa.base/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.base/.mps/migration.xml
+++ b/code/languages/org.mpsqa.base/.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
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd
index e71aa046..0687d017 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.base.lib" uuid="79c13063-8a7d-4070-aaba-966b36d6e0c4" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.base.lib" uuid="79c13063-8a7d-4070-aaba-966b36d6e0c4" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}/lib/commons-lang3-3.3.2" type="java_classes">
       <sourceRoot location="commons-lang3-3.3.2-javadoc.jar" />
@@ -13,15 +13,12 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/commons-lang3-3.3.2/commons-lang3-3.3.2-javadoc.jar" />
+      <library location="${module}/lib/commons-lang3-3.3.2/commons-lang3-3.3.2.jar" />
+      <library location="${module}/lib/commons-io-2.6.jar" />
+      <library location="${module}/lib/commons-cli-1.5.0.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/commons-lang3-3.3.2/commons-lang3-3.3.2-javadoc.jar" />
-    <stubModelEntry path="${module}/lib/commons-lang3-3.3.2/commons-lang3-3.3.2.jar" />
-    <stubModelEntry path="${module}/lib/commons-io-2.6.jar" />
-    <stubModelEntry path="${module}/lib/commons-cli-1.5.0.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
index 1eb37c03..5fe0e5c4 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
@@ -32,7 +32,6 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
@@ -63,7 +62,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>
@@ -74,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="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -87,7 +86,7 @@
       <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>
@@ -145,7 +144,7 @@
             </node>
             <node concept="2ShNRf" id="xCk$O6mj3r" role="33vP2m">
               <node concept="1pGfFk" id="xCk$O6mj3O" role="2ShVmc">
-                <ref role="37wK5l" to="fnpx:~Notification.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,com.intellij.notification.NotificationType,com.intellij.notification.NotificationListener)" resolve="Notification" />
+                <ref role="37wK5l" to="fnpx:~Notification.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,com.intellij.notification.NotificationType)" resolve="Notification" />
                 <node concept="2OqwBi" id="xCk$O6mjh0" role="37wK5m">
                   <node concept="37vLTw" id="zudvsqcbpf" role="2Oq$k0">
                     <ref role="3cqZAo" node="71GfFl7hN$8" resolve="mpsqaBalloonGroup" />
@@ -163,7 +162,6 @@
                 <node concept="37vLTw" id="xCk$O6mjA0" role="37wK5m">
                   <ref role="3cqZAo" node="xCk$O6mjqq" resolve="type" />
                 </node>
-                <node concept="10Nm6u" id="xCk$O6mj3X" role="37wK5m" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd
index a8354f1f..161e7e0f 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.base.utils" uuid="3867cfe1-8589-4ef1-9b3c-48b17d473edf" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.base.utils" uuid="3867cfe1-8589-4ef1-9b3c-48b17d473edf" 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>
   </dependencies>
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd
index d0d984c1..bdded7d7 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.treemap.lib" uuid="56f134c7-a829-428d-9119-715369c69768" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.treemap.lib" uuid="56f134c7-a829-428d-9119-715369c69768" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="jtreemap-1.1.0-bundle.jar" />
       <sourceRoot location="jtreemap-1.1.0.jar" />
       <sourceRoot location="net.sf.jtreemap.ktreemap-1.1.0-bundle.jar" />
@@ -14,17 +14,14 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/jtreemap-1.1.0-bundle.jar" />
+      <library location="${module}/lib/jtreemap-1.1.0.jar" />
+      <library location="${module}/lib/net.sf.jtreemap.ktreemap-1.1.0-bundle.jar" />
+      <library location="${module}/lib/net.sf.jtreemap.ktreemap-1.1.0.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/jtreemap-1.1.0-bundle.jar" />
-    <stubModelEntry path="${module}/lib/jtreemap-1.1.0.jar" />
-    <stubModelEntry path="${module}/lib/net.sf.jtreemap.ktreemap-1.1.0-bundle.jar" />
-    <stubModelEntry path="${module}/lib/net.sf.jtreemap.ktreemap-1.1.0.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/org.mpsqa.build/.mps/migration.xml b/code/languages/org.mpsqa.build/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.build/.mps/migration.xml
+++ b/code/languages/org.mpsqa.build/.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
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps
index 85146730..e7b49378 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps
@@ -47,7 +47,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" />
@@ -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>
@@ -118,20 +118,6 @@
     <property role="turDy" value="build_all_scripts.xml" />
     <node concept="398rNT" id="7C9PHv6FBIK" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="7C9PHv6FBIS" role="398pKh">
-        <node concept="2Ry0Ak" id="7C9PHv6FBJ3" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="7C9PHv6FBJh" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="7C9PHv6FBJx" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="67NgLmjP_3j" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2020_3_5" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="7C9PHv6FBIJ" role="1l3spd">
       <property role="TrG5h" value="mpsqa.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
index 3282287b..b181740b 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
@@ -49,7 +49,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" />
@@ -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>
@@ -91,11 +91,11 @@
       </concept>
       <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
       <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
-        <property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
         <child id="5253498789149547825" name="sources" index="3bR31x" />
         <child id="5253498789149547704" name="dependencies" index="3bR37C" />
       </concept>
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
+        <property id="5253498789149547713" name="reexport" index="3bR36h" />
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
@@ -126,20 +126,6 @@
     <node concept="3b7kt6" id="7C9PHv6FBII" role="10PD9s" />
     <node concept="398rNT" id="7C9PHv6FBIK" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="7C9PHv6FBIS" role="398pKh">
-        <node concept="2Ry0Ak" id="7C9PHv6FBJ3" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="7C9PHv6FBJh" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="7C9PHv6FBJx" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="7C9PHv6FBJP" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="7C9PHv6FBIJ" role="1l3spd">
       <property role="TrG5h" value="mpsqa.home" />
@@ -351,7 +337,6 @@
         <property role="TrG5h" value="org.mpsqa.base.lib" />
         <property role="3LESm3" value="79c13063-8a7d-4070-aaba-966b36d6e0c4" />
         <property role="BnDLt" value="true" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="7C9PHv6FBJa" role="3LF7KH">
           <ref role="398BVh" node="7C9PHv6FBIL" resolve="mpsqa.base.home" />
           <node concept="2Ry0Ak" id="7C9PHv6FBJr" role="iGT6I">
@@ -470,6 +455,7 @@
         </node>
         <node concept="1SiIV0" id="7C9PHv6FBMH" role="3bR37C">
           <node concept="3bR9La" id="7C9PHv6FBMI" role="1SiIV1">
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps
index ceb9a782..158ec7a7 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps
@@ -50,7 +50,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" />
@@ -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/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
index 44d93119..fee5df04 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
@@ -47,7 +47,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" />
@@ -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>
@@ -98,11 +98,14 @@
       <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
         <child id="763829979718664967" name="files" index="3rtmxm" />
       </concept>
-      <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
-      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
-      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
-        <child id="9200313594498201639" name="generator" index="1TViLv" />
+      <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
+        <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
+        <property id="8137134783396676838" name="extracted" index="1HemKv" />
+        <property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
+        <child id="8137134783396676835" name="location" index="1HemKq" />
       </concept>
+      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD" />
       <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
         <property id="8369506495128725901" name="compact" index="BnDLt" />
         <property id="322010710375892619" name="uuid" index="3LESm3" />
@@ -132,20 +135,6 @@
     </node>
     <node concept="398rNT" id="2JVMSZMFXgl" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="2JVMSZMFXMl" role="398pKh">
-        <node concept="2Ry0Ak" id="2JVMSZMFXNT" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="2JVMSZMFXR3" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="2JVMSZMFXTN" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3PN66LDqbXa" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="2JVMSZMFXgq" role="1l3spd">
       <property role="TrG5h" value="mpsqa.clones.home" />
@@ -265,34 +254,31 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2JVMSZMFXhS" role="3bR37C">
-          <node concept="3bR9La" id="2JVMSZMFXhT" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2JVMSZMFXEZ" role="3bR37C">
-          <node concept="3bR9La" id="2JVMSZMFXF0" role="1SiIV1">
-            <ref role="3bR37D" node="2JVMSZMFXgM" resolve="org.mpsqa.clones.pluginSolution" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2JVMSZMFXF1" role="3bR37C">
           <node concept="3bR9La" id="2JVMSZMFXF2" role="1SiIV1">
             <ref role="3bR37D" to="2tou:7C9PHv6FBJ1" resolve="org.mpsqa.base.lib" />
           </node>
         </node>
-        <node concept="1SiIV0" id="vol1C1m$hK" role="3bR37C">
-          <node concept="3bR9La" id="vol1C1m$hL" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="vol1C1m$hM" role="3bR37C">
-          <node concept="3bR9La" id="vol1C1m$hN" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L8Y" resolve="jetbrains.mps.lang.project" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="vol1C1m$hO" role="3bR37C">
-          <node concept="3bR9La" id="vol1C1m$hP" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
+        <node concept="1BupzO" id="7j9Wyvhv8Nj" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8Nk" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8N8" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8N9" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8Na" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.core" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8Nb" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8Nl" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
           </node>
         </node>
       </node>
@@ -373,6 +359,28 @@
             </node>
           </node>
         </node>
+        <node concept="1BupzO" id="7j9Wyvhv8Nx" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8Ny" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8Nm" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8Nn" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8No" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.pluginSolution" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8Np" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8Nz" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2JVMSZMFXgS" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -441,6 +449,28 @@
             </node>
           </node>
         </node>
+        <node concept="1BupzO" id="7j9Wyvhv8NJ" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8NK" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8N$" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8N_" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8NA" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.config.pluginSolution" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8NB" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8NL" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="2JVMSZMFXgY" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -463,10 +493,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1yeLz9" id="2JVMSZMFXiy" role="1TViLv">
-          <property role="TrG5h" value="org.mpsqa.clones.config#01" />
-          <property role="3LESm3" value="652ee78b-a037-4640-8f3d-b20c9bc39b99" />
-        </node>
         <node concept="3rtmxn" id="2JVMSZMFXCE" role="3bR31x">
           <node concept="3LXTmp" id="2JVMSZMFXCF" role="3rtmxm">
             <node concept="398BVA" id="2JVMSZMFXCG" role="3LXTmr">
@@ -493,6 +519,28 @@
             <ref role="3bR37D" node="2JVMSZMFXgA" resolve="org.mpsqa.clones.core" />
           </node>
         </node>
+        <node concept="1BupzO" id="7j9Wyvhv8NX" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8NY" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8NM" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8NN" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8NO" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.config" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8NP" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8NZ" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="1GhTetdB0pU" role="auvoZ" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
index 33c5cd8b..a4ce8e28 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
@@ -48,7 +48,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" />
@@ -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>
@@ -99,7 +99,6 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
-      <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
@@ -107,9 +106,7 @@
         <child id="8137134783396676835" name="location" index="1HemKq" />
       </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
-      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
-        <child id="9200313594498201639" name="generator" index="1TViLv" />
-      </concept>
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD" />
       <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
         <property id="8369506495128725901" name="compact" index="BnDLt" />
         <property id="322010710375892619" name="uuid" index="3LESm3" />
@@ -142,20 +139,6 @@
     </node>
     <node concept="398rNT" id="3PN66LDqBYS" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3PN66LDqBZ0" role="398pKh">
-        <node concept="2Ry0Ak" id="3PN66LDqBZf" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3PN66LDqBZV" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3PN66LDqC0y" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3PN66LDqC0E" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="3PN66LDqBYT" role="1l3spd">
       <property role="TrG5h" value="mpsqa.mutant.home" />
@@ -372,35 +355,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1yeLz9" id="3PN66LDqBZQ" role="1TViLv">
-          <property role="TrG5h" value="org.mpsqa.mutant#01" />
-          <property role="3LESm3" value="a1ea3065-b806-410b-ace7-90f70832ba61" />
-          <node concept="1BupzO" id="3PN66LDrCxb" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="3PN66LDrCxc" role="1HemKq">
-              <node concept="398BVA" id="3PN66LDrCwY" role="3LXTmr">
-                <ref role="398BVh" node="3PN66LDqBYT" resolve="mpsqa.mutant.home" />
-                <node concept="2Ry0Ak" id="3PN66LDrCwZ" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="3PN66LDrCx0" role="2Ry0An">
-                    <property role="2Ry0Am" value="org.mpsqa.mutant" />
-                    <node concept="2Ry0Ak" id="3PN66LDrCx1" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="3PN66LDrCx2" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="3PN66LDrCxd" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="3PN66LDqBZT" role="3bR37C">
           <node concept="3bR9La" id="3PN66LDqC0x" role="1SiIV1">
             <ref role="3bR37D" node="3PN66LDqBZa" resolve="org.mpsqa.mutant.base" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
index 8c45e61c..d731072a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
@@ -49,7 +49,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" />
@@ -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>
@@ -145,20 +145,6 @@
     </node>
     <node concept="398rNT" id="1YSnQiVh0x6" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="1YSnQiVh0xf" role="398pKh">
-        <node concept="2Ry0Ak" id="1YSnQiVh0xt" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="1YSnQiVh0xW" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="1YSnQiVh0yn" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="1YSnQiVh0yz" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="1YSnQiVh0x7" role="1l3spd">
       <property role="TrG5h" value="mpsqa.unused.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
index d4302fdd..c12ea88a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
@@ -52,7 +52,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" />
@@ -65,7 +65,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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,20 +149,6 @@
     </node>
     <node concept="398rNT" id="50Wzfz4shz4" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="50Wzfz4shzd" role="398pKh">
-        <node concept="2Ry0Ak" id="50Wzfz4shzp" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="50Wzfz4shzI" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="50Wzfz4shzY" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="50Wzfz4sh$6" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="50Wzfz4shz5" role="1l3spd">
       <property role="TrG5h" value="mpsqa.arch.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
index cc847851..19ef015a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
@@ -49,7 +49,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" />
@@ -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>
@@ -142,20 +142,6 @@
     </node>
     <node concept="398rNT" id="3dqUbgQmcyu" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3dqUbgQmcyB" role="398pKh">
-        <node concept="2Ry0Ak" id="3dqUbgQmcyO" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3dqUbgQmcze" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3dqUbgQmcz$" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3dqUbgQmczM" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="3dqUbgQmcyv" role="1l3spd">
       <property role="TrG5h" value="mpsqa.deprecated.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
index a929bec9..e0733a94 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
@@ -48,7 +48,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" />
@@ -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>
@@ -148,20 +148,6 @@
     </node>
     <node concept="398rNT" id="3dqUbgQmcyu" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3dqUbgQmcyB" role="398pKh">
-        <node concept="2Ry0Ak" id="3dqUbgQmcyO" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3dqUbgQmcze" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3dqUbgQmcz$" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3dqUbgQmczM" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="3dqUbgQmcyv" role="1l3spd">
       <property role="TrG5h" value="mpsqa.lint.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
index e577227e..3cc103ad 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
@@ -48,7 +48,7 @@
         <child id="5617550519002745378" name="macros" index="1l3spd" />
         <child id="5617550519002745372" name="layout" index="1l3spN" />
       </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="841011766565753074" name="jetbrains.mps.build.structure.BuildLayout_Import" flags="ng" index="3_I8Xc">
@@ -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>
@@ -110,20 +110,6 @@
     </node>
     <node concept="398rNT" id="3PN66LDqBUA" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3PN66LDqBUI" role="398pKh">
-        <node concept="2Ry0Ak" id="3PN66LDqBUX" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3PN66LDqBVD" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3PN66LDqBWg" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3PN66LDqBWo" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="2sgV4H" id="3PN66LDqBUC" role="1l3spa">
       <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd
index 0153697b..fcd304e0 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.build" uuid="11d4368a-a7e8-4dd9-bfc6-c2de268d1994" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.build" uuid="11d4368a-a7e8-4dd9-bfc6-c2de268d1994" 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>
   </dependencies>
diff --git a/code/languages/org.mpsqa.clones/.mps/migration.xml b/code/languages/org.mpsqa.clones/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.clones/.mps/migration.xml
+++ b/code/languages/org.mpsqa.clones/.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
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
deleted file mode 100644
index a6415af2..00000000
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b4bbaa4c-10f8-4967-96a5-ce8d80aca69f(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="mpzi" ref="r:07e7fd96-d60b-4292-b200-0ad59ee3fadf(org.mpsqa.clones.config.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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="7vLq_hstKZO">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps
index 9e8bc6a0..f5bf9731 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps
@@ -61,7 +61,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="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" />
@@ -92,7 +92,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/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
index 9c92d00c..a1c7ca29 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.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" />
@@ -104,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" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -131,7 +131,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/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
index f2ed2c2c..587b27a4 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -81,7 +81,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/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
index ee954bcd..1d317017 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.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/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
index 6c5ae70c..dd533043 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
@@ -11,50 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.clones.config#01" uuid="652ee78b-a037-4640-8f3d-b20c9bc39b99">
-      <models>
-        <modelRoot contentPath="${module}/generator/template" type="default">
-          <sourceRoot location="." />
-        </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>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <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" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="56cfcf05-92e4-4822-8126-2ea0e0cece6b(org.mpsqa.clones.config)" version="0" />
-        <module reference="652ee78b-a037-4640-8f3d-b20c9bc39b99(org.mpsqa.clones.config#01)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">56cfcf05-92e4-4822-8126-2ea0e0cece6b(org.mpsqa.clones.config)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -64,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/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
index 78958804..196084f8 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
@@ -62,7 +62,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" />
@@ -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>
@@ -192,23 +192,6 @@
     </node>
     <node concept="398rNT" id="1GhTetdB0o4" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="1GhTetdB0o5" role="398pKh">
-        <node concept="2Ry0Ak" id="1GhTetdB0o6" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="1GhTetdB0o7" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="1GhTetdB0o8" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="1GhTetdB0o9" role="2Ry0An">
-                <property role="2Ry0Am" value=".." />
-                <node concept="2Ry0Ak" id="52XWqlKvtCw" role="2Ry0An">
-                  <property role="2Ry0Am" value="MPS_2019_3" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="1GhTetdB0oc" role="1l3spd">
       <property role="TrG5h" value="mpsqa.clones.home" />
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd
index 18362303..6217a996 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.build" uuid="cf9e90bb-6263-4505-b1d0-f6a2339ece89" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.clones.build" uuid="cf9e90bb-6263-4505-b1d0-f6a2339ece89" 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">11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)</dependency>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
index a8278594..ae90a2c1 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:25548f5d-0136-4f75-9ca1-c4b4d92849fc(org.mpsqa.clones.config.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="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" />
@@ -34,6 +34,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" />
@@ -56,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>
@@ -68,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="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -128,7 +129,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>
@@ -144,7 +145,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" />
@@ -155,7 +156,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>
@@ -166,13 +167,12 @@
       </concept>
     </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="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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,12 +181,7 @@
   <node concept="sE7Ow" id="7WP_sw5x5wE">
     <property role="TrG5h" value="CheckClonesForConfig" />
     <property role="2uzpH1" value="Detect Clones for Configuration" />
-    <node concept="2S4$dB" id="7WP_sw5xafg" role="1NuT2Z">
-      <property role="TrG5h" value="model" />
-      <node concept="3Tm6S6" id="7WP_sw5xafh" role="1B3o_S" />
-      <node concept="1oajcY" id="7WP_sw5xafi" role="1oa70y" />
-      <node concept="H_c77" id="7WP_sw5x5x4" role="1tU5fm" />
-    </node>
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="7WP_sw5xcoC" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
index 9bdddc40..29c396d9 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/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="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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
@@ -100,7 +100,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>
@@ -115,12 +115,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" />
@@ -164,7 +165,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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 @@
       <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="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" />
@@ -585,7 +585,7 @@
                       <node concept="TSZUe" id="7vLq_hsuPVj" role="2OqNvi">
                         <node concept="2OqwBi" id="7vLq_hsuQtK" role="25WWJ7">
                           <node concept="37vLTw" id="7vLq_hsuQaQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7vLq_hsuxiY" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEpJWg" />
                           </node>
                           <node concept="3TrcHB" id="7vLq_hsuQTw" role="2OqNvi">
                             <ref role="3TsBF5" to="mpzi:7vLq_hstMm1" resolve="value" />
@@ -595,9 +595,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7vLq_hsuxiY" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7vLq_hsuxiZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -636,7 +636,7 @@
                       <node concept="TSZUe" id="1GhTetdXR3J" role="2OqNvi">
                         <node concept="2OqwBi" id="1GhTetdXR3K" role="25WWJ7">
                           <node concept="37vLTw" id="1GhTetdXR3L" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1GhTetdXR3N" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEpJWi" />
                           </node>
                           <node concept="3TrcHB" id="1GhTetdXR3M" role="2OqNvi">
                             <ref role="3TsBF5" to="mpzi:7vLq_hstMm1" resolve="value" />
@@ -646,9 +646,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1GhTetdXR3N" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWi" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1GhTetdXR3O" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -687,7 +687,7 @@
                       <node concept="TSZUe" id="7vLq_hsuR73" role="2OqNvi">
                         <node concept="2OqwBi" id="7vLq_hsuR74" role="25WWJ7">
                           <node concept="37vLTw" id="7vLq_hsuR75" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7vLq_hsuR77" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEpJWk" />
                           </node>
                           <node concept="3TrcHB" id="7vLq_hsuR76" role="2OqNvi">
                             <ref role="3TsBF5" to="mpzi:7vLq_hstMm1" resolve="value" />
@@ -697,9 +697,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7vLq_hsuR77" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7vLq_hsuR78" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -738,7 +738,7 @@
                       <node concept="TSZUe" id="GBiWXwJxuN" role="2OqNvi">
                         <node concept="2OqwBi" id="GBiWXwJxuO" role="25WWJ7">
                           <node concept="37vLTw" id="GBiWXwJxuP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="GBiWXwJxuR" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEpJWm" />
                           </node>
                           <node concept="3TrcHB" id="GBiWXwJxuQ" role="2OqNvi">
                             <ref role="3TsBF5" to="mpzi:7vLq_hstMm1" resolve="value" />
@@ -748,9 +748,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="GBiWXwJxuR" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWm" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="GBiWXwJxuS" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWn" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd
index 4c40a4c4..bd697310 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.config.pluginSolution" uuid="c444eed9-4c7b-48e8-a62c-124f7b6b1712" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="org.mpsqa.clones.config.pluginSolution" uuid="c444eed9-4c7b-48e8-a62c-124f7b6b1712" 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>
@@ -24,11 +23,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: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: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/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
index a023210d..61b54097 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
@@ -5,7 +5,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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" 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" />
   </languages>
   <imports>
@@ -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="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>
@@ -170,7 +170,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">
@@ -197,6 +197,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" />
@@ -244,7 +245,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">
@@ -282,7 +283,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" />
@@ -2129,15 +2129,15 @@
                       <node concept="liA8E" id="7vLq_hsvnpW" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
                         <node concept="37vLTw" id="7vLq_hsvnxW" role="37wK5m">
-                          <ref role="3cqZAo" node="7vLq_hsv9JJ" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkEpJWo" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7vLq_hsv9JJ" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWo" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7vLq_hsv9JK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWp" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2186,15 +2186,15 @@
                       <node concept="liA8E" id="1GhTetdWR8c" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
                         <node concept="37vLTw" id="1GhTetdWR8d" role="37wK5m">
-                          <ref role="3cqZAo" node="1GhTetdWR8e" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkEpJWq" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1GhTetdWR8e" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1GhTetdWR8f" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2228,15 +2228,15 @@
                       <node concept="liA8E" id="7vLq_hsvnHw" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
                         <node concept="37vLTw" id="7vLq_hsvnHx" role="37wK5m">
-                          <ref role="3cqZAo" node="7vLq_hsvnHy" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkEpJWs" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7vLq_hsvnHy" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7vLq_hsvnHz" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2270,15 +2270,15 @@
                       <node concept="liA8E" id="GBiWXwJcra" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
                         <node concept="37vLTw" id="GBiWXwJcrb" role="37wK5m">
-                          <ref role="3cqZAo" node="GBiWXwJcrc" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkEpJWu" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="GBiWXwJcrc" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="GBiWXwJcrd" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWv" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
index 3a411c24..2d13563e 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.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" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -101,7 +101,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 @@
         <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">
@@ -166,10 +166,10 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1156234966388" name="shortDescription" index="OYnhT" />
       </concept>
-      <concept id="1196978630214" name="jetbrains.mps.lang.core.structure.IResolveInfo" flags="ng" index="2Lv6Xg">
+      <concept id="1196978630214" name="jetbrains.mps.lang.core.structure.IResolveInfo" flags="ngI" index="2Lv6Xg">
         <property id="1196978656277" name="resolveInfo" index="2Lvdk3" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
index 08ae5751..53bb0205 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@@ -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">
@@ -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>
@@ -144,7 +144,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">
@@ -176,6 +176,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" />
@@ -220,7 +221,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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" />
       </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="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" />
@@ -2463,16 +2463,16 @@
                             </node>
                             <node concept="3JPx81" id="16s82eElVBq" role="2OqNvi">
                               <node concept="37vLTw" id="16s82eElVBr" role="25WWJ7">
-                                <ref role="3cqZAo" node="16s82eElVBs" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEpJWw" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="16s82eElVBs" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkEpJWw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="16s82eElVBt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkEpJWx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.mps
index 8db55eef..0a111eff 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.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" />
   </languages>
   <imports>
@@ -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>
@@ -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" />
@@ -85,7 +85,7 @@
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd
index 1e5f9485..2a4fd57f 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.core" uuid="48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.clones.core" uuid="48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7" 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>
@@ -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: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/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps
index 7c7afb1b..1a37642d 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:ed1698f2-09b0-401d-8270-553b97a848b2(org.mpsqa.clones.java.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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
@@ -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>
@@ -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/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd
index 66782d4f..25cbe5ce 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.java.pluginSolution" uuid="8c28db4d-2bb8-4f5a-91e6-1a90a7def21a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.mpsqa.clones.java.pluginSolution" uuid="8c28db4d-2bb8-4f5a-91e6-1a90a7def21a" 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">48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7(org.mpsqa.clones.core)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
@@ -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/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
index 43294bfb..4edd1ee4 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
@@ -2,10 +2,10 @@
 <model ref="r:5175eac3-0a5d-4c65-831f-fd941c428d79(org.mpsqa.clones.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="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="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@@ -48,6 +48,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" />
@@ -87,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>
@@ -110,7 +111,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">
@@ -197,7 +198,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>
@@ -215,7 +216,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" />
@@ -228,7 +229,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" />
@@ -251,7 +252,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>
@@ -376,6 +377,7 @@
   <node concept="sE7Ow" id="7WP_sw5x5wE">
     <property role="TrG5h" value="CheckClonesFromModel" />
     <property role="2uzpH1" value="Detect Clones from Model" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="7WP_sw5xafg" role="1NuT2Z">
       <property role="TrG5h" value="model" />
       <node concept="3Tm6S6" id="7WP_sw5xafh" role="1B3o_S" />
@@ -489,6 +491,7 @@
   <node concept="sE7Ow" id="7WP_sw5_Sso">
     <property role="TrG5h" value="CheckClonesFromProject" />
     <property role="2uzpH1" value="Detect Clones from Project" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="7WP_sw5_Sst" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
index 5c46801e..a3f716b1 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
@@ -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">
@@ -141,7 +141,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>
@@ -163,7 +163,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">
@@ -202,6 +202,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" />
@@ -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>
@@ -280,7 +281,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="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" />
@@ -1459,16 +1459,16 @@
                                 </node>
                                 <node concept="2OqwBi" id="1zTNC9MIdQa" role="3uHU7B">
                                   <node concept="37vLTw" id="1zTNC9MHs$M" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1zTNC9MHs$N" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkEpJWy" />
                                   </node>
                                   <node concept="2Rxl7S" id="1zTNC9MIHuQ" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1zTNC9MHs$N" role="1bW2Oz">
+                          <node concept="gl6BB" id="1vMaDkEpJWy" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1zTNC9MHs$O" role="1tU5fm" />
+                            <node concept="2jxLKc" id="1vMaDkEpJWz" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
index 4cc6ac6e..9ee1b651 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" 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="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" />
@@ -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="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -137,7 +137,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>
@@ -156,7 +156,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">
@@ -195,6 +195,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" />
@@ -247,7 +248,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="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" />
@@ -466,7 +466,7 @@
                                 <node concept="3clFbF" id="4Q49ENJ8ctT" role="3cqZAp">
                                   <node concept="2OqwBi" id="4Q49ENJ8cQ2" role="3clFbG">
                                     <node concept="37vLTw" id="4Q49ENJ8ctS" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4Q49ENJ7IZ$" resolve="it" />
+                                      <ref role="3cqZAo" node="1vMaDkEpJW$" />
                                     </node>
                                     <node concept="liA8E" id="4Q49ENJ8eAg" role="2OqNvi">
                                       <ref role="37wK5l" to="2e2r:4Q49ENJ7O5e" resolve="affectsModel" />
@@ -477,9 +477,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4Q49ENJ7IZ$" role="1bW2Oz">
+                              <node concept="gl6BB" id="1vMaDkEpJW$" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4Q49ENJ7IZ_" role="1tU5fm" />
+                                <node concept="2jxLKc" id="1vMaDkEpJW_" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1259,7 +1259,7 @@
                   <node concept="3clFbF" id="4vC8GjwYLrv" role="3cqZAp">
                     <node concept="2OqwBi" id="4vC8GjwYL$j" role="3clFbG">
                       <node concept="37vLTw" id="4vC8GjwYLru" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4vC8GjwYL7R" resolve="it" />
+                        <ref role="3cqZAo" node="1vMaDkEpJWA" />
                       </node>
                       <node concept="liA8E" id="4vC8GjwYMZy" role="2OqNvi">
                         <ref role="37wK5l" to="2e2r:4Q49ENJ9$96" resolve="affectsRootNode" />
@@ -1270,9 +1270,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4vC8GjwYL7R" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEpJWA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4vC8GjwYL7S" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEpJWB" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd
index 1c70b378..6c242124 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.pluginSolution" uuid="6e30e90d-e786-4b8b-9ecd-fe6904eef946" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.mpsqa.clones.pluginSolution" uuid="6e30e90d-e786-4b8b-9ecd-fe6904eef946" 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">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</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:73736c50-f124-433b-b789-2828a15a0adc:jetbrains.mps.baseLanguage.collections.trove" 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" />
     <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/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps
index 6dacee06..80a80ed7 100644
--- a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps
+++ b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps
@@ -33,7 +33,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/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
index 6c48919e..e6d414a9 100644
--- a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
+++ b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.clones.config.sandbox" uuid="07ca2ddb-0edf-4512-9064-c538a85893c1" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.clones.config.sandbox" uuid="07ca2ddb-0edf-4512-9064-c538a85893c1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
-  <sourcePath />
   <languageVersions>
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:56cfcf05-92e4-4822-8126-2ea0e0cece6b:org.mpsqa.clones.config" version="-1" />
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
index 7fcbab9a..681932cb 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@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="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="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="56cfcf05-92e4-4822-8126-2ea0e0cece6b" name="org.mpsqa.clones.config" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
@@ -77,7 +77,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>
@@ -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/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.mps
index a7a6658a..fa7cdc18 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.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/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
index 91573883..a1d67558 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.org.mpsqa.clones.headless" uuid="3f198f21-a320-4b82-bf5e-e7c501e76d9d" moduleVersion="0" compileInMPS="true">
+<solution name="test.org.mpsqa.clones.headless" uuid="3f198f21-a320-4b82-bf5e-e7c501e76d9d" 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">c444eed9-4c7b-48e8-a62c-124f7b6b1712(org.mpsqa.clones.config.pluginSolution)</dependency>
@@ -24,11 +23,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:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
index 466e562b..ba18dea4 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@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="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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
@@ -101,7 +101,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>
@@ -113,7 +113,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" />
@@ -145,9 +145,13 @@
       <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">
+        <property id="8575328350543493365" name="message" index="huDt6" />
+        <property id="2423417345669755629" name="filter" index="1eyWvh" />
+      </concept>
     </language>
   </registry>
   <node concept="2XOHcx" id="5dW8pSKf75s">
@@ -328,6 +332,10 @@
         <node concept="2tJIrI" id="4elAKXiq8DM" role="jymVt" />
         <node concept="312cEg" id="4elAKXiq8Eo" role="jymVt">
           <property role="TrG5h" value="a1" />
+          <node concept="15s5l7" id="7j9Wyvhu0wU" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Field is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7581428506283755675]&quot;;" />
+            <property role="huDt6" value="Warning: Field is never used" />
+          </node>
           <node concept="17QB3L" id="4elAKXiq8Ea" role="1tU5fm" />
           <node concept="Xl_RD" id="4elAKXiq8EO" role="33vP2m">
             <property role="Xl_RC" value="something" />
@@ -338,6 +346,10 @@
         </node>
         <node concept="312cEg" id="4elAKXiq8FC" role="jymVt">
           <property role="TrG5h" value="a2" />
+          <node concept="15s5l7" id="7j9Wyvhu0z0" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Field is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7581428506283755675]&quot;;" />
+            <property role="huDt6" value="Warning: Field is never used" />
+          </node>
           <node concept="17QB3L" id="4elAKXiq8FD" role="1tU5fm" />
           <node concept="Xl_RD" id="4elAKXiq8FE" role="33vP2m">
             <property role="Xl_RC" value="something1" />
@@ -348,6 +360,10 @@
         </node>
         <node concept="312cEg" id="4elAKXiqb1T" role="jymVt">
           <property role="TrG5h" value="a3" />
+          <node concept="15s5l7" id="7j9Wyvhu0_6" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Field is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7581428506283755675]&quot;;" />
+            <property role="huDt6" value="Warning: Field is never used" />
+          </node>
           <node concept="17QB3L" id="4elAKXiqb1U" role="1tU5fm" />
           <node concept="3cpWs3" id="4elAKXiqbh0" role="33vP2m">
             <node concept="3cmrfG" id="4elAKXiqbhf" role="3uHU7w">
@@ -364,6 +380,10 @@
         <node concept="2tJIrI" id="4elAKXiq8Fq" role="jymVt" />
         <node concept="3clFb_" id="4elAKXiqfkC" role="jymVt">
           <property role="TrG5h" value="meth" />
+          <node concept="15s5l7" id="7j9Wyvhu0Bm" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Package protected method meth():void is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7938578788781949884]&quot;;" />
+            <property role="huDt6" value="Warning: Package protected method meth():void is never used" />
+          </node>
           <node concept="3clFbS" id="4elAKXiqfkF" role="3clF47">
             <node concept="9aQIb" id="4elAKXiqflp" role="3cqZAp">
               <node concept="3clFbS" id="4elAKXiqflq" role="9aQI4">
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
index 09556319..65c2afad 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
@@ -58,7 +58,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>
@@ -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/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
index 398b654c..6b837849 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
@@ -58,7 +58,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>
@@ -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/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
index 3e0e8664..e5569025 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
@@ -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>
@@ -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/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
index feb8874b..101209e8 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
@@ -57,7 +57,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>
@@ -68,15 +68,22 @@
         <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="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="312cEu" id="5dW8pSK6xri">
@@ -86,6 +93,14 @@
       <property role="TrG5h" value="meth1" />
       <node concept="3clFbS" id="5dW8pSK6xti" role="3clF47">
         <node concept="3cpWs8" id="5dW8pSK6y2p" role="3cqZAp">
+          <node concept="15s5l7" id="7j9Wyvhu3jT" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Variable 'a' initializer is redundant&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/963887337804010668]&quot;;" />
+            <property role="huDt6" value="Warning: Variable 'a' initializer is redundant" />
+          </node>
+          <node concept="15s5l7" id="7j9Wyvhu1e_" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Unused variable&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/4056233746948448436]&quot;;" />
+            <property role="huDt6" value="Warning: Unused variable" />
+          </node>
           <node concept="3cpWsn" id="5dW8pSK6y2s" role="3cpWs9">
             <property role="TrG5h" value="a" />
             <node concept="10Oyi0" id="5dW8pSK6y2n" role="1tU5fm" />
@@ -145,6 +160,14 @@
       <property role="TrG5h" value="meth2" />
       <node concept="3clFbS" id="5dW8pSK6_4h" role="3clF47">
         <node concept="3cpWs8" id="5dW8pSK6_4i" role="3cqZAp">
+          <node concept="15s5l7" id="7j9Wyvhu2mM" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Unused variable&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/4056233746948448436]&quot;;" />
+            <property role="huDt6" value="Warning: Unused variable" />
+          </node>
+          <node concept="15s5l7" id="7j9Wyvhu1pG" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Variable 'a' initializer is redundant&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/963887337804010668]&quot;;" />
+            <property role="huDt6" value="Warning: Variable 'a' initializer is redundant" />
+          </node>
           <node concept="3cpWsn" id="5dW8pSK6_4j" role="3cpWs9">
             <property role="TrG5h" value="a" />
             <node concept="10Oyi0" id="5dW8pSK6_4k" role="1tU5fm" />
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
index 168616a4..6596bb4c 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
@@ -39,20 +39,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/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
index a7d0c611..15ea9dfb 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.org.mpsqa.clones" uuid="54e0d114-6207-49e4-a0f6-ed8cd64992b2" moduleVersion="0" compileInMPS="true">
+<solution name="test.org.mpsqa.clones" uuid="54e0d114-6207-49e4-a0f6-ed8cd64992b2" 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">48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7(org.mpsqa.clones.core)</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: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/org.mpsqa.deprecated/.mps/migration.xml b/code/languages/org.mpsqa.deprecated/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.deprecated/.mps/migration.xml
+++ b/code/languages/org.mpsqa.deprecated/.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
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
deleted file mode 100644
index c5617de9..00000000
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:792fc33e-d546-44f0-8b16-783996978f8f(org.mpsqa.deprecated.example_lan.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="a69o" ref="r:96c04daa-82d3-42de-a138-984ac0a40302(org.mpsqa.deprecated.example_lan.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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="4z4cFcoLYUA">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.editor.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.editor.mps
index 0936841a..a7ef0499 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.editor.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.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="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.structure.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.structure.mps
index 9f376f55..7001230d 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.structure.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.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/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
index c9e53540..512c7dd9 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
@@ -11,55 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.deprecated.example_lan.generator" uuid="45589ccc-6ba9-4836-9136-04256950ca3f">
-      <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>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <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" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="4964867e-90b8-4a58-b13e-6cd7893d620f(org.mpsqa.deprecated.example_lan)" version="0" />
-        <module reference="45589ccc-6ba9-4836-9136-04256950ca3f(org.mpsqa.deprecated.example_lan.generator)" version="0" />
-      </dependencyVersions>
-      <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/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps
index 04477959..e802abb8 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps
@@ -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="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -99,7 +99,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/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps
index d8e09a90..4444cf02 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps
@@ -117,7 +117,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>
@@ -138,7 +138,7 @@
       </concept>
       <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
       <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">
@@ -153,6 +153,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" />
@@ -256,7 +257,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">
@@ -318,7 +319,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" />
@@ -523,7 +523,7 @@
                         <node concept="1rXfSq" id="45IuY9n8dwy" role="3clFbG">
                           <ref role="37wK5l" node="7LZ1KAVTsur" resolve="conceptIsDeprecatedForLongTime" />
                           <node concept="37vLTw" id="45IuY9n8dBP" role="37wK5m">
-                            <ref role="3cqZAo" node="45IuY9n8dir" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkE5o0a" />
                           </node>
                           <node concept="37vLTw" id="45IuY9n8dRs" role="37wK5m">
                             <ref role="3cqZAo" node="45IuY9n8bvM" resolve="deprecationTime" />
@@ -531,9 +531,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="45IuY9n8dir" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkE5o0a" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="45IuY9n8dis" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkE5o0b" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -634,7 +634,7 @@
                                       <node concept="3EllGN" id="45IuY9nerQE" role="2Oq$k0">
                                         <node concept="2OqwBi" id="45IuY9neski" role="3ElVtu">
                                           <node concept="37vLTw" id="45IuY9nes1w" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="45IuY9neo6B" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkE5o0c" />
                                           </node>
                                           <node concept="2yIwOk" id="45IuY9nesCh" role="2OqNvi" />
                                         </node>
@@ -644,7 +644,7 @@
                                       </node>
                                       <node concept="TSZUe" id="45IuY9nev7r" role="2OqNvi">
                                         <node concept="37vLTw" id="45IuY9nevrX" role="25WWJ7">
-                                          <ref role="3cqZAo" node="45IuY9neo6B" resolve="it" />
+                                          <ref role="3cqZAo" node="1vMaDkE5o0c" />
                                         </node>
                                       </node>
                                     </node>
@@ -657,7 +657,7 @@
                                   <node concept="2Nt0df" id="45IuY9new58" role="2OqNvi">
                                     <node concept="2OqwBi" id="45IuY9newE0" role="38cxEo">
                                       <node concept="37vLTw" id="45IuY9newko" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="45IuY9neo6B" resolve="it" />
+                                        <ref role="3cqZAo" node="1vMaDkE5o0c" />
                                       </node>
                                       <node concept="2yIwOk" id="45IuY9newXu" role="2OqNvi" />
                                     </node>
@@ -670,7 +670,7 @@
                                         <node concept="3EllGN" id="45IuY9nexkk" role="37vLTJ">
                                           <node concept="2OqwBi" id="45IuY9nexkl" role="3ElVtu">
                                             <node concept="37vLTw" id="45IuY9nexkm" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="45IuY9neo6B" resolve="it" />
+                                              <ref role="3cqZAo" node="1vMaDkE5o0c" />
                                             </node>
                                             <node concept="2yIwOk" id="45IuY9nexkn" role="2OqNvi" />
                                           </node>
@@ -682,7 +682,7 @@
                                           <node concept="Tc6Ow" id="45IuY9neC7l" role="2ShVmc">
                                             <node concept="3Tqbb2" id="45IuY9neC7m" role="HW$YZ" />
                                             <node concept="37vLTw" id="45IuY9neC7n" role="HW$Y0">
-                                              <ref role="3cqZAo" node="45IuY9neo6B" resolve="it" />
+                                              <ref role="3cqZAo" node="1vMaDkE5o0c" />
                                             </node>
                                           </node>
                                         </node>
@@ -695,7 +695,7 @@
                             <node concept="1rXfSq" id="45IuY9neo6$" role="3clFbw">
                               <ref role="37wK5l" node="7LZ1KAVTsur" resolve="conceptIsDeprecatedForLongTime" />
                               <node concept="37vLTw" id="45IuY9neo6_" role="37wK5m">
-                                <ref role="3cqZAo" node="45IuY9neo6B" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkE5o0c" />
                               </node>
                               <node concept="37vLTw" id="45IuY9neo6A" role="37wK5m">
                                 <ref role="3cqZAo" node="7LZ1KAVU66V" resolve="deprecationTime" />
@@ -703,9 +703,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="45IuY9neo6B" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkE5o0c" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="45IuY9neo6C" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkE5o0d" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -796,7 +796,7 @@
                                       <node concept="2OqwBi" id="45IuY9nfNcs" role="2Oq$k0">
                                         <node concept="2OqwBi" id="45IuY9nfedX" role="2Oq$k0">
                                           <node concept="37vLTw" id="45IuY9nfedY" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="45IuY9nfeeo" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkE5o0g" />
                                           </node>
                                           <node concept="3AV6Ez" id="45IuY9nfedZ" role="2OqNvi" />
                                         </node>
@@ -817,7 +817,7 @@
                                                     <ref role="2pIpSl" to="3idh:7LZ1KAVUTVV" resolve="node" />
                                                     <node concept="36biLy" id="45IuY9nfee7" role="28nt2d">
                                                       <node concept="37vLTw" id="45IuY9nfee8" role="36biLW">
-                                                        <ref role="3cqZAo" node="45IuY9nfee9" resolve="it2" />
+                                                        <ref role="3cqZAo" node="1vMaDkE5o0e" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -825,9 +825,9 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="45IuY9nfee9" role="1bW2Oz">
+                                          <node concept="gl6BB" id="1vMaDkE5o0e" role="1bW2Oz">
                                             <property role="TrG5h" value="it2" />
-                                            <node concept="2jxLKc" id="45IuY9nfeea" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="1vMaDkE5o0f" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -844,7 +844,7 @@
                                           <node concept="2OqwBi" id="45IuY9nfeeg" role="36biLW">
                                             <node concept="2OqwBi" id="45IuY9nfeeh" role="2Oq$k0">
                                               <node concept="37vLTw" id="45IuY9nfeei" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="45IuY9nfeeo" resolve="it" />
+                                                <ref role="3cqZAo" node="1vMaDkE5o0g" />
                                               </node>
                                               <node concept="3AY5_j" id="45IuY9nfeej" role="2OqNvi" />
                                             </node>
@@ -864,9 +864,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="45IuY9nfeeo" role="1bW2Oz">
+                              <node concept="gl6BB" id="1vMaDkE5o0g" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="45IuY9nfeep" role="1tU5fm" />
+                                <node concept="2jxLKc" id="1vMaDkE5o0h" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1381,16 +1381,16 @@
                               </node>
                               <node concept="2OqwBi" id="45IuY9naysi" role="3uHU7B">
                                 <node concept="37vLTw" id="45IuY9naysj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="45IuY9naysl" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkE5o0i" />
                                 </node>
                                 <node concept="2NL2c5" id="45IuY9naysk" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="45IuY9naysl" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkE5o0i" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="45IuY9naysm" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkE5o0j" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1789,7 +1789,7 @@
                             <ref role="cht4Q" to="tpce:hOasaTk" resolve="DeprecatedNodeAnnotation" />
                           </node>
                           <node concept="37vLTw" id="3dqUbgQpMoN" role="1m5AlR">
-                            <ref role="3cqZAo" node="3dqUbgQpF3v" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkE5o0k" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="3dqUbgQpMJI" role="37wK5m">
@@ -1798,7 +1798,7 @@
                       </node>
                       <node concept="2OqwBi" id="3dqUbgQpF3r" role="3uHU7B">
                         <node concept="37vLTw" id="3dqUbgQpF3s" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3dqUbgQpF3v" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkE5o0k" />
                         </node>
                         <node concept="1mIQ4w" id="3dqUbgQpF3t" role="2OqNvi">
                           <node concept="chp4Y" id="3dqUbgQpF3u" role="cj9EA">
@@ -1809,9 +1809,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3dqUbgQpF3v" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkE5o0k" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3dqUbgQpF3w" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkE5o0l" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.structure.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.structure.mps
index 62d98930..1b714652 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.structure.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.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/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
index fc58a588..4b5b96d9 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
@@ -6,7 +6,7 @@
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <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="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>
@@ -105,7 +105,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">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl
index c6b393db..0c102eb3 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</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/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps
index b9b189e2..b5388fca 100644
--- a/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps
+++ b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps
@@ -34,7 +34,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/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd
index f1803900..8194fc6e 100644
--- a/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd
+++ b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.deprecated.sandbox" uuid="3fb40ad3-c4f3-4da0-9f88-0c2a1446f870" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.deprecated.sandbox" uuid="3fb40ad3-c4f3-4da0-9f88-0c2a1446f870" 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:b73ca93f-6762-4398-b251-df0d708b305b:org.mpsqa.deprecated" version="0" />
diff --git a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps
index 47cf1b9e..271e26ec 100644
--- a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps
+++ b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps
@@ -6,7 +6,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="b73ca93f-6762-4398-b251-df0d708b305b" name="org.mpsqa.deprecated" 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="4964867e-90b8-4a58-b13e-6cd7893d620f" name="org.mpsqa.deprecated.example_lan" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
@@ -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" />
@@ -90,7 +90,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,6 +109,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,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>
@@ -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="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>
@@ -290,7 +290,7 @@
                             </node>
                             <node concept="2OqwBi" id="45IuY9nk6pI" role="3uHU7B">
                               <node concept="37vLTw" id="3dqUbgQtrOl" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3dqUbgQtrOn" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkE5o0n" />
                               </node>
                               <node concept="3TrcHB" id="45IuY9nk6Il" role="2OqNvi">
                                 <ref role="3TsBF5" to="3idh:3imng2mXeQS" resolve="modelName" />
@@ -299,9 +299,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3dqUbgQtrOn" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkE5o0n" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3dqUbgQtrOo" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkE5o0o" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
index cb0e89fe..b30ebbc0 100644
--- a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
+++ b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.org.mpsqa.deprecated" uuid="8f2c31a9-ead9-438f-9d3a-9462b63a7bac" moduleVersion="0" compileInMPS="true">
+<solution name="test.org.mpsqa.deprecated" uuid="8f2c31a9-ead9-438f-9d3a-9462b63a7bac" 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">b73ca93f-6762-4398-b251-df0d708b305b(org.mpsqa.deprecated)</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: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/org.mpsqa.lint/.mps/migration.xml b/code/languages/org.mpsqa.lint/.mps/migration.xml
index 8ca43043..0946a125 100644
--- a/code/languages/org.mpsqa.lint/.mps/migration.xml
+++ b/code/languages/org.mpsqa.lint/.mps/migration.xml
@@ -5,7 +5,9 @@
     <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.baseline.version" value="211" />
-    <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/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@generator.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@generator.mps
index 72e921ad..9a7d8e46 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@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>
@@ -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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -158,7 +158,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/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
index 186fa8e0..f4f71a2a 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
@@ -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>
@@ -117,13 +117,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" />
@@ -191,7 +192,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>
@@ -221,7 +222,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="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" />
@@ -538,7 +538,7 @@
                                 <ref role="1Pybhc" node="78RogMCHKPV" resolve="Node2ID" />
                                 <node concept="2OqwBi" id="5vskli_kHn8" role="37wK5m">
                                   <node concept="37vLTw" id="5vskli_kHn9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5vskli_kHnk" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkE80pk" />
                                   </node>
                                   <node concept="2OwXpG" id="5vskli_kHna" role="2OqNvi">
                                     <ref role="2Oxat5" to="zn9m:~Pair.second" resolve="second" />
@@ -551,7 +551,7 @@
                               <node concept="2OqwBi" id="5vskli_kHnc" role="3uHU7B">
                                 <node concept="2OqwBi" id="5vskli_kHnd" role="2Oq$k0">
                                   <node concept="37vLTw" id="5vskli_kHne" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5vskli_kHnk" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkE80pk" />
                                   </node>
                                   <node concept="2OwXpG" id="5vskli_kHnf" role="2OqNvi">
                                     <ref role="2Oxat5" to="zn9m:~Pair.first" resolve="first" />
@@ -572,9 +572,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5vskli_kHnk" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkE80pk" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5vskli_kHnl" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkE80pl" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -598,15 +598,15 @@
                           </node>
                           <node concept="3dhRuq" id="7Jrb4Zs$mhA" role="2OqNvi">
                             <node concept="37vLTw" id="7Jrb4Zs$nh_" role="25WWJ7">
-                              <ref role="3cqZAo" node="7Jrb4Zs$guC" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkE80pm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Jrb4Zs$guC" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkE80pm" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Jrb4Zs$guD" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkE80pn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -689,7 +689,7 @@
                                     <node concept="2OqwBi" id="7Jrb4Zs$PV0" role="3uHU7B">
                                       <node concept="2OqwBi" id="7Jrb4Zs$O$r" role="2Oq$k0">
                                         <node concept="37vLTw" id="7Jrb4Zs$Oby" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7Jrb4Zs$NKb" resolve="it2" />
+                                          <ref role="3cqZAo" node="1vMaDkE80po" />
                                         </node>
                                         <node concept="2OwXpG" id="7Jrb4Zs$P4y" role="2OqNvi">
                                           <ref role="2Oxat5" to="zn9m:~Pair.first" resolve="first" />
@@ -699,7 +699,7 @@
                                         <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                         <node concept="2OqwBi" id="7Jrb4Zs$RyW" role="37wK5m">
                                           <node concept="37vLTw" id="7Jrb4Zs$R7A" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3QoR82Ydibc" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkE80pq" />
                                           </node>
                                           <node concept="3TrcHB" id="7Jrb4Zs$S21" role="2OqNvi">
                                             <ref role="3TsBF5" to="a1af:6gY6GEDvQYT" resolve="result" />
@@ -712,22 +712,22 @@
                                       <ref role="1Pybhc" node="78RogMCHKPV" resolve="Node2ID" />
                                       <node concept="2OqwBi" id="78RogMCIqRV" role="37wK5m">
                                         <node concept="37vLTw" id="78RogMCIqRW" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7Jrb4Zs$NKb" resolve="it2" />
+                                          <ref role="3cqZAo" node="1vMaDkE80po" />
                                         </node>
                                         <node concept="2OwXpG" id="78RogMCIqRX" role="2OqNvi">
                                           <ref role="2Oxat5" to="zn9m:~Pair.second" resolve="second" />
                                         </node>
                                       </node>
                                       <node concept="37vLTw" id="78RogMCIx$D" role="37wK5m">
-                                        <ref role="3cqZAo" node="3QoR82Ydibc" resolve="it" />
+                                        <ref role="3cqZAo" node="1vMaDkE80pq" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7Jrb4Zs$NKb" role="1bW2Oz">
+                              <node concept="gl6BB" id="1vMaDkE80po" role="1bW2Oz">
                                 <property role="TrG5h" value="it2" />
-                                <node concept="2jxLKc" id="7Jrb4Zs$NKc" role="1tU5fm" />
+                                <node concept="2jxLKc" id="1vMaDkE80pp" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -735,9 +735,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3QoR82Ydibc" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkE80pq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3QoR82Ydibd" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkE80pr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -756,7 +756,7 @@
                             <ref role="37wK5l" to="zn9m:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
                             <node concept="2OqwBi" id="7Jrb4Zs_1CS" role="37wK5m">
                               <node concept="37vLTw" id="7Jrb4Zs_1fj" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3QoR82YdlDq" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkE80ps" />
                               </node>
                               <node concept="3TrcHB" id="7Jrb4Zs_20U" role="2OqNvi">
                                 <ref role="3TsBF5" to="a1af:6gY6GEDvQYT" resolve="result" />
@@ -764,7 +764,7 @@
                             </node>
                             <node concept="2OqwBi" id="7Jrb4Zs_31$" role="37wK5m">
                               <node concept="37vLTw" id="7Jrb4Zs_2E4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3QoR82YdlDq" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkE80ps" />
                               </node>
                               <node concept="3TrcHB" id="78RogMCI$VO" role="2OqNvi">
                                 <ref role="3TsBF5" to="a1af:78RogMCGEUf" resolve="resultNodeId" />
@@ -776,9 +776,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3QoR82YdlDq" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkE80ps" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3QoR82YdlDr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkE80pt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -873,7 +873,7 @@
                                 <node concept="2OqwBi" id="78RogMCGR7M" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="78RogMCGQJZ" role="2Oq$k0">
                                     <node concept="37vLTw" id="78RogMCGQiC" role="2JrQYb">
-                                      <ref role="3cqZAo" node="78RogMCGPZ0" resolve="it" />
+                                      <ref role="3cqZAo" node="1vMaDkE80pu" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="78RogMCGRq_" role="2OqNvi">
@@ -893,9 +893,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="78RogMCGPZ0" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkE80pu" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="78RogMCGPZ1" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkE80pv" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps
index e11005ad..fb43cfc3 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps
@@ -60,7 +60,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>
@@ -74,7 +74,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" />
@@ -93,7 +93,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 @@
         <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" />
@@ -160,7 +160,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>
@@ -203,7 +203,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/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps
index b6fa3b00..0aeb1659 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps
@@ -68,7 +68,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/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
index 549dd01f..a9b1d0a1 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
@@ -6,7 +6,7 @@
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <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="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
@@ -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">
@@ -117,7 +117,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 @@
       </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">
@@ -228,7 +228,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/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.util.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.util.mps
index a5ac0a99..61c412c2 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.util.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.util.mps
@@ -133,7 +133,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 @@
       <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">
@@ -185,6 +185,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">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -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="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" />
@@ -1181,7 +1181,7 @@
                               <node concept="1pGfFk" id="7Jrb4Zsz1Hz" role="2ShVmc">
                                 <ref role="37wK5l" to="zn9m:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
                                 <node concept="37vLTw" id="7Jrb4Zsz28p" role="37wK5m">
-                                  <ref role="3cqZAo" node="6srt3FwKBSW" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkE80pw" />
                                 </node>
                                 <node concept="37vLTw" id="78RogMCF$c0" role="37wK5m">
                                   <ref role="3cqZAo" node="38klfj4H5X1" resolve="defaultNodeToReportErrors" />
@@ -1192,9 +1192,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6srt3FwKBSW" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkE80pw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6srt3FwKBSX" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkE80px" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
index ddf70a7c..1e4e9c3d 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
@@ -31,7 +31,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" />
@@ -65,7 +65,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
@@ -84,7 +83,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
index 9e3eb470..facfd08d 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
@@ -61,7 +61,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="5248329904287794596" name="jetbrains.mps.build.structure.BuildInputFiles" flags="ng" index="3LXTmp">
@@ -73,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>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd
index 6f23d29f..8c41c212 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.lint.build" uuid="a89565e6-84af-4e8f-ad86-d4a45e3387fe" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.lint.build" uuid="a89565e6-84af-4e8f-ad86-d4a45e3387fe" 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">11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps
index 4f0a505d..8de72101 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -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" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -109,7 +109,7 @@
       <concept id="7741759128795038157" name="org.mpsqa.lint.generic.structure.CheckableScriptParameter" flags="ng" index="2j1K4_">
         <child id="7741759128795045740" name="tpe" index="2j1LY4" />
       </concept>
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -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>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps
index 71e380c3..577c207a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="18" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -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">
@@ -72,7 +72,7 @@
       <concept id="7741759128795038157" name="org.mpsqa.lint.generic.structure.CheckableScriptParameter" flags="ng" index="2j1K4_">
         <child id="7741759128795045740" name="tpe" index="2j1LY4" />
       </concept>
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -82,7 +82,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="2555875871752198907" name="org.mpsqa.lint.generic.structure.ConceptFunctionParameter_MPSProject" flags="ng" index="1MG55F" />
@@ -94,6 +94,7 @@
       <concept id="2555875871751904530" name="org.mpsqa.lint.generic.structure.CheckingFunction" flags="ig" index="1MIXq2" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -138,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>
@@ -182,7 +183,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="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -265,7 +265,7 @@
                       <node concept="3clFbF" id="4lfwJVE_54H" role="3cqZAp">
                         <node concept="2OqwBi" id="4lfwJVE_54I" role="3clFbG">
                           <node concept="37vLTw" id="4lfwJVE_54J" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4lfwJVE_54L" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkE80pz" />
                           </node>
                           <node concept="3TrEf2" id="4lfwJVE_54K" role="2OqNvi">
                             <ref role="3Tt5mk" to="a1af:3ibIDIklSMM" resolve="script" />
@@ -273,9 +273,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4lfwJVE_54L" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkE80pz" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4lfwJVE_54M" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkE80p$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
index 3b8f9166..712d7622 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
-    <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" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -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>
@@ -129,7 +129,7 @@
       <concept id="7741759128795038157" name="org.mpsqa.lint.generic.structure.CheckableScriptParameter" flags="ng" index="2j1K4_">
         <child id="7741759128795045740" name="tpe" index="2j1LY4" />
       </concept>
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -139,7 +139,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ng" index="3dgnlL">
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
         <child id="7223240310078271420" name="violations" index="3dgnlQ" />
       </concept>
       <concept id="7223240310078271416" name="org.mpsqa.lint.generic.structure.ResultEntry" flags="ng" index="3dgnlM">
@@ -155,6 +155,7 @@
       <concept id="2555875871751904530" name="org.mpsqa.lint.generic.structure.CheckingFunction" flags="ig" index="1MIXq2" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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>
@@ -232,7 +233,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" />
@@ -1112,7 +1112,7 @@
                               <node concept="3clFbF" id="52u1lgl_5Kk" role="3cqZAp">
                                 <node concept="2OqwBi" id="52u1lgl_5Th" role="3clFbG">
                                   <node concept="37vLTw" id="52u1lgl_5Kj" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="52u1lgl_5DX" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkE80p_" />
                                   </node>
                                   <node concept="liA8E" id="52u1lgl_6cH" role="2OqNvi">
                                     <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -1123,9 +1123,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="52u1lgl_5DX" role="1bW2Oz">
+                            <node concept="gl6BB" id="1vMaDkE80p_" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="52u1lgl_5DY" role="1tU5fm" />
+                              <node concept="2jxLKc" id="1vMaDkE80pA" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1265,7 +1265,7 @@
                               <node concept="3clFbF" id="52u1lgl_btt" role="3cqZAp">
                                 <node concept="2OqwBi" id="52u1lgl_btu" role="3clFbG">
                                   <node concept="37vLTw" id="52u1lgl_btv" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="52u1lgl_bty" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkE80pB" />
                                   </node>
                                   <node concept="liA8E" id="52u1lgl_btw" role="2OqNvi">
                                     <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -1276,9 +1276,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="52u1lgl_bty" role="1bW2Oz">
+                            <node concept="gl6BB" id="1vMaDkE80pB" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="52u1lgl_btz" role="1tU5fm" />
+                              <node concept="2jxLKc" id="1vMaDkE80pC" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1326,7 +1326,7 @@
                                   <node concept="2OqwBi" id="4CoQK0Ze8us" role="3clFbG">
                                     <node concept="2OqwBi" id="4CoQK0Ze8ut" role="2Oq$k0">
                                       <node concept="37vLTw" id="4CoQK0Ze8uu" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4CoQK0Ze8ux" resolve="it" />
+                                        <ref role="3cqZAo" node="1vMaDkE80pD" />
                                       </node>
                                       <node concept="liA8E" id="4CoQK0Ze8uv" role="2OqNvi">
                                         <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
@@ -1338,9 +1338,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4CoQK0Ze8ux" role="1bW2Oz">
+                              <node concept="gl6BB" id="1vMaDkE80pD" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4CoQK0Ze8uy" role="1tU5fm" />
+                                <node concept="2jxLKc" id="1vMaDkE80pE" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1363,24 +1363,24 @@
                                 <node concept="3clFbF" id="4CoQK0Zeaw1" role="3cqZAp">
                                   <node concept="2OqwBi" id="4CoQK0Zeaw2" role="3clFbG">
                                     <node concept="37vLTw" id="4CoQK0Zeaw3" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4CoQK0Zeaw6" resolve="a" />
+                                      <ref role="3cqZAo" node="1vMaDkE80pF" />
                                     </node>
                                     <node concept="liA8E" id="4CoQK0Zeaw4" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
                                       <node concept="37vLTw" id="4CoQK0Zeaw5" role="37wK5m">
-                                        <ref role="3cqZAo" node="4CoQK0Zeaw8" resolve="b" />
+                                        <ref role="3cqZAo" node="1vMaDkE80pH" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4CoQK0Zeaw6" role="1bW2Oz">
+                              <node concept="gl6BB" id="1vMaDkE80pF" role="1bW2Oz">
                                 <property role="TrG5h" value="a" />
-                                <node concept="2jxLKc" id="4CoQK0Zeaw7" role="1tU5fm" />
+                                <node concept="2jxLKc" id="1vMaDkE80pG" role="1tU5fm" />
                               </node>
-                              <node concept="Rh6nW" id="4CoQK0Zeaw8" role="1bW2Oz">
+                              <node concept="gl6BB" id="1vMaDkE80pH" role="1bW2Oz">
                                 <property role="TrG5h" value="b" />
-                                <node concept="2jxLKc" id="4CoQK0Zeaw9" role="1tU5fm" />
+                                <node concept="2jxLKc" id="1vMaDkE80pI" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="4CoQK0Zeawa" role="2Dq5b$">
@@ -1879,7 +1879,7 @@
                                     <node concept="3clFbF" id="72dZnKNfW81" role="3cqZAp">
                                       <node concept="2OqwBi" id="72dZnKNfY1r" role="3clFbG">
                                         <node concept="37vLTw" id="72dZnKNfW80" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="72dZnKNfVYD" resolve="it" />
+                                          <ref role="3cqZAo" node="1vMaDkE80pJ" />
                                         </node>
                                         <node concept="liA8E" id="72dZnKNfYoU" role="2OqNvi">
                                           <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
@@ -1887,9 +1887,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="72dZnKNfVYD" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkE80pJ" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="72dZnKNfVYE" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkE80pK" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
index 369c19f4..77ba383a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -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="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -145,7 +145,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>
@@ -170,7 +170,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">
@@ -198,6 +198,7 @@
       <concept id="2555875871751904530" name="org.mpsqa.lint.generic.structure.CheckingFunction" flags="ig" index="1MIXq2" />
     </language>
     <language id="fd392034-7849-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" />
@@ -220,7 +221,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 @@
         <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" />
@@ -1768,7 +1768,7 @@
                                       <node concept="3clFbF" id="72dZnKNaWBD" role="3cqZAp">
                                         <node concept="2OqwBi" id="72dZnKNaX2f" role="3clFbG">
                                           <node concept="37vLTw" id="72dZnKNaWBC" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="72dZnKNaWhI" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkE80pL" />
                                           </node>
                                           <node concept="liA8E" id="72dZnKNaXQn" role="2OqNvi">
                                             <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -1779,9 +1779,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="72dZnKNaWhI" role="1bW2Oz">
+                                    <node concept="gl6BB" id="1vMaDkE80pL" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="72dZnKNaWhJ" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="1vMaDkE80pM" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1793,14 +1793,14 @@
                                       <node concept="3y3z36" id="72dZnKNb1Pm" role="3clFbG">
                                         <node concept="10Nm6u" id="72dZnKNb2v6" role="3uHU7w" />
                                         <node concept="37vLTw" id="72dZnKNb1rx" role="3uHU7B">
-                                          <ref role="3cqZAo" node="72dZnKNb0Yw" resolve="it" />
+                                          <ref role="3cqZAo" node="1vMaDkE80pN" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="72dZnKNb0Yw" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkE80pN" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="72dZnKNb0Yx" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkE80pO" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1811,7 +1811,7 @@
                                   <node concept="3clFbF" id="72dZnKNaUwS" role="3cqZAp">
                                     <node concept="2OqwBi" id="72dZnKNaUwT" role="3clFbG">
                                       <node concept="37vLTw" id="72dZnKNaUwV" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="72dZnKNaUwZ" resolve="it" />
+                                        <ref role="3cqZAo" node="1vMaDkE80pP" />
                                       </node>
                                       <node concept="liA8E" id="72dZnKNaUwY" role="2OqNvi">
                                         <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
@@ -1819,9 +1819,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="72dZnKNaUwZ" role="1bW2Oz">
+                                <node concept="gl6BB" id="1vMaDkE80pP" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="72dZnKNaUx0" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="1vMaDkE80pQ" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2057,7 +2057,7 @@
                                     <node concept="3clFbF" id="4CoQK0Ze0gm" role="3cqZAp">
                                       <node concept="2OqwBi" id="4CoQK0Ze0gn" role="3clFbG">
                                         <node concept="37vLTw" id="4CoQK0Ze0go" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4CoQK0Ze0gq" resolve="it" />
+                                          <ref role="3cqZAo" node="1vMaDkE80pR" />
                                         </node>
                                         <node concept="liA8E" id="4CoQK0Ze0gp" role="2OqNvi">
                                           <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -2065,9 +2065,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4CoQK0Ze0gq" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkE80pR" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4CoQK0Ze0gr" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkE80pS" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -2090,24 +2090,24 @@
                                     <node concept="3clFbF" id="4CoQK0Ze4IT" role="3cqZAp">
                                       <node concept="2OqwBi" id="4CoQK0Ze4IU" role="3clFbG">
                                         <node concept="37vLTw" id="4CoQK0Ze4IV" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4CoQK0Ze4IY" resolve="a" />
+                                          <ref role="3cqZAo" node="1vMaDkE80pT" />
                                         </node>
                                         <node concept="liA8E" id="4CoQK0Ze4IW" role="2OqNvi">
                                           <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
                                           <node concept="37vLTw" id="4CoQK0Ze4IX" role="37wK5m">
-                                            <ref role="3cqZAo" node="4CoQK0Ze4J0" resolve="b" />
+                                            <ref role="3cqZAo" node="1vMaDkE80pV" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4CoQK0Ze4IY" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkE80pT" role="1bW2Oz">
                                     <property role="TrG5h" value="a" />
-                                    <node concept="2jxLKc" id="4CoQK0Ze4IZ" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkE80pU" role="1tU5fm" />
                                   </node>
-                                  <node concept="Rh6nW" id="4CoQK0Ze4J0" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkE80pV" role="1bW2Oz">
                                     <property role="TrG5h" value="b" />
-                                    <node concept="2jxLKc" id="4CoQK0Ze4J1" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkE80pW" role="1tU5fm" />
                                   </node>
                                 </node>
                                 <node concept="1nlBCl" id="4CoQK0Ze4J2" role="2Dq5b$">
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps
index 429ca6d3..d42f11a3 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -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>
@@ -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/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd
index 5cb7ca96..c54c151d 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.lint.generic.linters_library" uuid="a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.lint.generic.linters_library" uuid="a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9" 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">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -24,7 +23,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: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" />
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps
index f3f9760e..0ae4b104 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -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" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -126,7 +126,7 @@
       <concept id="7741759128795038157" name="org.mpsqa.lint.generic.structure.CheckableScriptParameter" flags="ng" index="2j1K4_">
         <child id="7741759128795045740" name="tpe" index="2j1LY4" />
       </concept>
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -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/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps
index 9324429f..ea87c47a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps
@@ -15,7 +15,7 @@
       </concept>
     </language>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps
index ac91031d..62e25f5a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps
@@ -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/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
index 3e98eb93..f2931eb7 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.lint.generic.sandbox" uuid="6ce900c0-bfaf-49ef-a192-9b1044b1ac55" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.lint.generic.sandbox" uuid="6ce900c0-bfaf-49ef-a192-9b1044b1ac55" 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>
@@ -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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:de1ad86d-6e50-4a02-b306-d4d17f64c375:jetbrains.mps.console.base" version="0" />
     <language slang="l:f26691d2-0def-4c06-aec6-2cb90c4af0a4:jetbrains.mps.console.scripts" version="0" />
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps
index d325d3d5..e3ed1c7f 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
   </languages>
   <imports>
@@ -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>
@@ -129,7 +129,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps
index 751c2414..301d5388 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -46,7 +46,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">
@@ -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>
@@ -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="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -121,6 +121,7 @@
       <concept id="2555875871751904530" name="org.mpsqa.lint.generic.structure.CheckingFunction" flags="ig" index="1MIXq2" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -165,7 +166,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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="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" />
@@ -660,14 +660,14 @@
                                 <ref role="37wK5l" node="4jd8IzH_176" resolve="isDubiousCast" />
                                 <ref role="1Pybhc" node="4jd8IzHzPzF" resolve="NodeCasts" />
                                 <node concept="37vLTw" id="4jd8IzH_e7P" role="37wK5m">
-                                  <ref role="3cqZAo" node="4jd8IzH_amM" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkE80pX" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4jd8IzH_amM" role="1bW2Oz">
+                          <node concept="gl6BB" id="1vMaDkE80pX" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4jd8IzH_amN" role="1tU5fm" />
+                            <node concept="2jxLKc" id="1vMaDkE80pY" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -686,19 +686,19 @@
                                   <ref role="37wK5l" node="4jd8IzH_mDV" resolve="formatDubiousCastErrorMessage" />
                                   <ref role="1Pybhc" node="4jd8IzHzPzF" resolve="NodeCasts" />
                                   <node concept="37vLTw" id="4jd8IzH_rBs" role="37wK5m">
-                                    <ref role="3cqZAo" node="4jd8IzH_evf" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkE80pZ" />
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="4jd8IzH_sfb" role="37wK5m">
-                                  <ref role="3cqZAo" node="4jd8IzH_evf" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkE80pZ" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4jd8IzH_evf" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkE80pZ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4jd8IzH_evg" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkE80q0" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps
index 657cc409..7db64969 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" 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="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
   </languages>
   <imports>
@@ -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" />
       </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/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps
index c91079da..b9376a0b 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
-    <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="18" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -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" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -87,6 +87,7 @@
       <concept id="2555875871751904530" name="org.mpsqa.lint.generic.structure.CheckingFunction" flags="ig" index="1MIXq2" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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>
@@ -145,7 +146,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="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" />
@@ -190,7 +190,7 @@
                           <node concept="2OqwBi" id="6wojtGUmrM2" role="3fr31v">
                             <node concept="2OqwBi" id="6wojtGUmrM3" role="2Oq$k0">
                               <node concept="37vLTw" id="6wojtGUmrM4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6wojtGUmbW$" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkE80q1" />
                               </node>
                               <node concept="liA8E" id="6wojtGUmrM5" role="2OqNvi">
                                 <ref role="37wK5l" to="lui2:~SModule.getModels(java.util.function.Predicate)" resolve="getModels" />
@@ -220,9 +220,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6wojtGUmbW$" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkE80q1" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6wojtGUmbW_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkE80q2" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -233,7 +233,7 @@
                     <node concept="3clFbF" id="6wojtGUkV5H" role="3cqZAp">
                       <node concept="2OqwBi" id="6wojtGUm9MU" role="3clFbG">
                         <node concept="37vLTw" id="6wojtGUm9tu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6wojtGUkV5N" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkE80q3" />
                         </node>
                         <node concept="liA8E" id="6wojtGUmapS" role="2OqNvi">
                           <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -241,9 +241,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6wojtGUkV5N" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkE80q3" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6wojtGUkV5O" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkE80q4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -286,7 +286,7 @@
                       <node concept="3clFbF" id="6wojtGUtwmD" role="3cqZAp">
                         <node concept="2OqwBi" id="6wojtGUtwmE" role="3clFbG">
                           <node concept="37vLTw" id="6wojtGUtwmF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6wojtGUtwmH" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkE80q5" />
                           </node>
                           <node concept="liA8E" id="6wojtGUtwmG" role="2OqNvi">
                             <ref role="37wK5l" to="mhbf:~SModel.getRootNodes()" resolve="getRootNodes" />
@@ -294,9 +294,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6wojtGUtwmH" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkE80q5" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6wojtGUtwmI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkE80q6" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -339,7 +339,7 @@
                         <node concept="3clFbF" id="6wojtGUs$kp" role="3cqZAp">
                           <node concept="2OqwBi" id="6wojtGUs$kr" role="3clFbG">
                             <node concept="37vLTw" id="6wojtGUs$ks" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6wojtGUs$kB" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkE80q7" />
                             </node>
                             <node concept="3Tsc0h" id="6wojtGUs$kt" role="2OqNvi">
                               <ref role="3TtcxE" to="5tjl:3X9rC2XzJdK" resolve="modules" />
@@ -347,9 +347,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6wojtGUs$kB" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkE80q7" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6wojtGUs$kC" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkE80q8" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -360,7 +360,7 @@
                       <node concept="3clFbF" id="6wojtGUsJui" role="3cqZAp">
                         <node concept="2OqwBi" id="6wojtGUsK1t" role="3clFbG">
                           <node concept="37vLTw" id="6wojtGUsJuh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6wojtGUsJ8d" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkE80q9" />
                           </node>
                           <node concept="2qgKlT" id="6wojtGUsKUj" role="2OqNvi">
                             <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
@@ -368,9 +368,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6wojtGUsJ8d" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkE80q9" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6wojtGUsJ8e" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkE80qa" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -381,7 +381,7 @@
                     <node concept="3clFbF" id="6wojtGUsMN8" role="3cqZAp">
                       <node concept="2OqwBi" id="6wojtGUsNkX" role="3clFbG">
                         <node concept="37vLTw" id="6wojtGUsMN7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6wojtGUsMxy" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkE80qb" />
                         </node>
                         <node concept="3TrcHB" id="6wojtGUsOhA" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -389,9 +389,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6wojtGUsMxy" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkE80qb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6wojtGUsMxz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkE80qc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -436,15 +436,15 @@
                             <property role="Xl_RC" value="module '" />
                           </node>
                           <node concept="37vLTw" id="4I5DMJFtusq" role="3uHU7w">
-                            <ref role="3cqZAo" node="4I5DMJFtqRQ" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkE80qd" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4I5DMJFtqRQ" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkE80qd" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4I5DMJFtqRR" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkE80qe" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
index 9f30b31e..754cb512 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.lint.mps_lang.linters_library" uuid="12a40499-ed72-4b23-9437-358c4217c97b" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.lint.mps_lang.linters_library" uuid="12a40499-ed72-4b23-9437-358c4217c97b" 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">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -25,7 +24,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/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps
index 38b8f1a6..d8b3ef51 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps
@@ -63,14 +63,14 @@
       </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>
       <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" />
@@ -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/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd
index a150e58f..c0053b77 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.lint.test" uuid="8dea0738-32a6-4d3d-bd7c-7b5fd43da198" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.lint.test" uuid="8dea0738-32a6-4d3d-bd7c-7b5fd43da198" 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">12a40499-ed72-4b23-9437-358c4217c97b(org.mpsqa.lint.mps_lang.linters_library)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</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: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/org.mpsqa.mutant/.mps/migration.xml b/code/languages/org.mpsqa.mutant/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.mutant/.mps/migration.xml
+++ b/code/languages/org.mpsqa.mutant/.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
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
deleted file mode 100644
index 9f12f5f9..00000000
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:592d8aef-b1bd-4d2e-947a-4eb586c486ee(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="dfoi" ref="r:e7aa0652-5f88-4c12-b15d-0c397e3ad1db(org.mpsqa.mutant.demolang.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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="4eFGY40mZcM">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.editor.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.editor.mps
index f28e0cb5..995c12fb 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.editor.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.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="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -70,7 +70,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/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps
index 2cd9d303..d443ef9d 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps
@@ -36,7 +36,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/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
index 275dc9e9..22767f04 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
@@ -11,55 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.mutant.demolang#01" uuid="26d62420-05d2-444f-a995-9ef760c32323">
-      <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>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <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" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="3313ed27-e24e-4f1d-81b0-b1b57775ffac(org.mpsqa.mutant.demolang)" version="0" />
-        <module reference="26d62420-05d2-444f-a995-9ef760c32323(org.mpsqa.mutant.demolang#01)" version="0" />
-      </dependencyVersions>
-      <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/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps
deleted file mode 100644
index 2dc74aae..00000000
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a0096923-0f65-4bae-9f56-bbd0dd7b4560(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="2yhq" ref="r:fa8966f2-655e-439b-931a-1696875e83e1(org.mpsqa.mutant.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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="4eFGY40ppJM">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps
index c3c493ad..5fb858df 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps
@@ -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>
@@ -78,7 +78,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 @@
       <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/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.editor.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.editor.mps
index d40c266f..300e1999 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.editor.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.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/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.mps
index 06b731f9..7984a667 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.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>
@@ -84,6 +84,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" />
@@ -139,7 +140,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>
@@ -151,7 +152,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="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
@@ -316,7 +316,7 @@
                               </node>
                               <node concept="2OqwBi" id="5nCCIAzzT8v" role="1m5AlR">
                                 <node concept="37vLTw" id="5nCCIAzzT8w" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5nCCIAzzGLT" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEg7Qe" />
                                 </node>
                                 <node concept="3TrEf2" id="5nCCIAzzT8x" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tp25:34EJa6aIpny" resolve="languageId" />
@@ -329,9 +329,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5nCCIAzzGLT" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkEg7Qe" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5nCCIAzzGLU" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkEg7Qf" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.structure.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.structure.mps
index 356ef785..ee3af033 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.structure.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.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/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
index 557a1a15..ab1725d2 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
@@ -11,50 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.mutant#01" uuid="a1ea3065-b806-410b-ace7-90f70832ba61">
-      <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>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <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" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="1aa30e2f-c768-4ae5-9ea2-0d88d0d6d7bf(org.mpsqa.mutant)" version="0" />
-        <module reference="a1ea3065-b806-410b-ace7-90f70832ba61(org.mpsqa.mutant#01)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">434ae70d-b732-4ce4-82f0-942388529867(org.mpsqa.mutant.base)</dependency>
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
@@ -66,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/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.mps
index 82b1defa..c82e15f3 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.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="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <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" />
@@ -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="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -167,7 +167,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>
@@ -194,7 +194,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">
@@ -275,7 +275,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/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.mps
index c86cc787..1e41a2b6 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.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="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <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" />
@@ -12,24 +12,14 @@
   </languages>
   <imports>
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
-    <import index="4o98" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.platform(MPS.Core/)" />
-    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
     <import index="k2t0" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.checkers(MPS.Core/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
-    <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="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <import index="k8ev" ref="r:f39afe13-666a-48f2-9d7c-2f9366f78fe5(jetbrains.mps.typesystemEngine.checker)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
     <import index="6if8" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project.validation(MPS.Core/)" />
-    <import index="pdwk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.aspects.constraints.rules.kinds(MPS.Core/)" />
-    <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="o99v" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.aspects.constraints.rules(MPS.Core/)" />
     <import index="nihy" ref="r:fec576b8-7eeb-40c5-b5b5-c411a2c3150a(org.mpsqa.mutant.base.model_checkers)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -53,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">
@@ -145,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>
@@ -167,7 +157,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="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -196,6 +186,7 @@
       <concept id="8974276187400348183" name="jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement" flags="nn" index="1QHqEM" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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,7 +218,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>
@@ -266,7 +257,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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -438,7 +428,7 @@
                                 </node>
                                 <node concept="3BYIHo" id="4DkAay7XG9J" role="2OqNvi">
                                   <node concept="37vLTw" id="4DkAay7XG9K" role="3BYIHq">
-                                    <ref role="3cqZAo" node="4DkAay7XGa2" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkEg7Qh" />
                                   </node>
                                 </node>
                               </node>
@@ -454,7 +444,7 @@
                           <node concept="1rXfSq" id="4DkAay7XG9P" role="37vLTx">
                             <ref role="37wK5l" node="4DkAay7VSct" resolve="nodeHasErrors" />
                             <node concept="37vLTw" id="4DkAay7XG9Q" role="37wK5m">
-                              <ref role="3cqZAo" node="4DkAay7XGa2" resolve="it" />
+                              <ref role="3cqZAo" node="1vMaDkEg7Qh" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="5FP1kGC5gxy" role="37vLTJ">
@@ -468,7 +458,7 @@
                             <node concept="3clFbF" id="4DkAay7XG9U" role="3cqZAp">
                               <node concept="2OqwBi" id="4DkAay7XG9V" role="3clFbG">
                                 <node concept="37vLTw" id="4DkAay7XG9W" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4DkAay7XGa2" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEg7Qh" />
                                 </node>
                                 <node concept="3YRAZt" id="4DkAay7XG9X" role="2OqNvi" />
                               </node>
@@ -487,9 +477,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4DkAay7XGa2" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkEg7Qh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4DkAay7XGa3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkEg7Qi" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -775,7 +765,7 @@
                               </node>
                               <node concept="2OqwBi" id="5VJWClH1$Cs" role="3uHU7B">
                                 <node concept="37vLTw" id="5VJWClH1$Ct" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5VJWClH1$Cv" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEg7Qj" />
                                 </node>
                                 <node concept="liA8E" id="5VJWClH1$Cu" role="2OqNvi">
                                   <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
@@ -784,9 +774,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5VJWClH1$Cv" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkEg7Qj" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5VJWClH1$Cw" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkEg7Qk" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -921,7 +911,7 @@
                               </node>
                               <node concept="2OqwBi" id="5VJWClH1yLL" role="3uHU7B">
                                 <node concept="37vLTw" id="5VJWClH1yLM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5VJWClH1yLO" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEg7Ql" />
                                 </node>
                                 <node concept="liA8E" id="5VJWClH1yLN" role="2OqNvi">
                                   <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
@@ -930,9 +920,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5VJWClH1yLO" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkEg7Ql" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5VJWClH1yLP" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkEg7Qm" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -993,7 +983,7 @@
                               </node>
                               <node concept="2OqwBi" id="5VJWClH1Dh4" role="3uHU7B">
                                 <node concept="37vLTw" id="5VJWClH1Dh5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5VJWClH1Dh7" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEg7Qn" />
                                 </node>
                                 <node concept="liA8E" id="5VJWClH1Dh6" role="2OqNvi">
                                   <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
@@ -1002,9 +992,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5VJWClH1Dh7" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkEg7Qn" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5VJWClH1Dh8" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkEg7Qo" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.mps
index cfa93a25..ff1a8736 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
@@ -13,10 +13,8 @@
     <import index="j809" ref="aaaaf3e2-decf-4e97-bf80-9109eab759ee/java:jetbrains.mps.core.aspects.feedback.messages(jetbrains.mps.lang.feedback.problem.legacy-constraints/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="o99v" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules(jetbrains.mps.lang.constraints.rules.runtime/)" />
     <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="o99w" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.aspects.constraints.rules(MPS.Core/)" />
-    <import index="pdwl" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.aspects.constraints.rules.kinds(MPS.Core/)" />
+    <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" />
   </imports>
   <registry>
@@ -77,7 +75,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>
@@ -88,7 +86,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 +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>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -173,8 +171,8 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
             </node>
             <node concept="2YIFZM" id="5Lgg1tGH4pO" role="33vP2m">
-              <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="37vLTw" id="5Lgg1tGH4pP" role="37wK5m">
                 <ref role="3cqZAo" node="4VtLjdspz10" resolve="cc" />
               </node>
@@ -207,8 +205,8 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
             </node>
             <node concept="2YIFZM" id="5Lgg1tGH6lF" role="33vP2m">
-              <ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
-              <ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+              <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+              <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
               <node concept="37vLTw" id="5Lgg1tGH6lG" role="37wK5m">
                 <ref role="3cqZAo" node="4VtLjdspz10" resolve="cc" />
               </node>
@@ -295,8 +293,8 @@
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 </node>
                 <node concept="2YIFZM" id="5Lgg1tGH7FZ" role="33vP2m">
-                  <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="37vLTw" id="5Lgg1tGH7G0" role="37wK5m">
                     <ref role="3cqZAo" node="5VJWClHvcG4" resolve="cbac" />
                   </node>
@@ -416,8 +414,8 @@
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 </node>
                 <node concept="2YIFZM" id="5Lgg1tGH9hT" role="33vP2m">
-                  <ref role="37wK5l" to="ykok:~ConstraintsChildAndPropFacade.checkPropertyValue(jetbrains.mps.core.aspects.feedback.messages.FailingPropertyConstraintContext)" resolve="checkPropertyValue" />
-                  <ref role="1Pybhc" to="ykok:~ConstraintsChildAndPropFacade" resolve="ConstraintsChildAndPropFacade" />
+                  <ref role="37wK5l" to="ykol:~ConstraintsChildAndPropFacade.checkPropertyValue(jetbrains.mps.core.aspects.feedback.messages.FailingPropertyConstraintContext)" resolve="checkPropertyValue" />
+                  <ref role="1Pybhc" to="ykol:~ConstraintsChildAndPropFacade" resolve="ConstraintsChildAndPropFacade" />
                   <node concept="37vLTw" id="5Lgg1tGH9hU" role="37wK5m">
                     <ref role="3cqZAo" node="5VJWClHvfbZ" resolve="fpcc" />
                   </node>
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps
index 555d18e6..cf2c1612 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps
@@ -18,7 +18,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">
@@ -66,7 +66,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>
@@ -81,7 +81,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" />
@@ -92,7 +92,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/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.mps
index 02a33e1f..d2fd3d82 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.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="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <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" />
@@ -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="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -78,7 +78,7 @@
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <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>
@@ -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="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -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/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.mps
index 0818cf32..9e553491 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.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>
@@ -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">
@@ -81,7 +81,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>
@@ -92,13 +92,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="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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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="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>
@@ -134,7 +135,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="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="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -300,7 +300,7 @@
                           <node concept="3JPx81" id="4DkAay7V22o" role="2OqNvi">
                             <node concept="2OqwBi" id="4DkAay7V22p" role="25WWJ7">
                               <node concept="37vLTw" id="4DkAay7V22q" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4DkAay7V22s" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEg7Qp" />
                               </node>
                               <node concept="2yIwOk" id="4DkAay7V22r" role="2OqNvi" />
                             </node>
@@ -308,9 +308,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4DkAay7V22s" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkEg7Qp" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4DkAay7V22t" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkEg7Qq" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.mps
index 3ded8be2..67d47a1d 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.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="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <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" />
@@ -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="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -83,7 +83,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>
@@ -98,7 +98,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" />
@@ -114,6 +114,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" />
@@ -143,7 +144,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>
@@ -154,7 +155,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="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" />
@@ -273,7 +273,7 @@
                             <node concept="2OqwBi" id="5nCCIAzyOyG" role="3clFbG">
                               <node concept="2OqwBi" id="5nCCIAzyO6N" role="2Oq$k0">
                                 <node concept="37vLTw" id="5nCCIAzyNWH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5nCCIAzyNRh" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEg7Qr" />
                                 </node>
                                 <node concept="3CFZ6_" id="5nCCIAzyOdr" role="2OqNvi">
                                   <node concept="3CFYIy" id="5nCCIAzyOkT" role="3CFYIz">
@@ -285,9 +285,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5nCCIAzyNRh" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkEg7Qr" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5nCCIAzyNRi" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkEg7Qs" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps
index 7fcbd75c..c6b318ef 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps
@@ -3,14 +3,13 @@
   <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="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="1aa30e2f-c768-4ae5-9ea2-0d88d0d6d7bf" name="org.mpsqa.mutant" version="0" />
   </languages>
   <imports>
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="bo4c" ref="r:35b024ae-ffc9-4278-a30d-780e13e60804(org.mpsqa.mutant.base.core)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="2yhq" ref="r:fa8966f2-655e-439b-931a-1696875e83e1(org.mpsqa.mutant.structure)" />
@@ -100,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>
@@ -119,7 +118,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">
@@ -133,6 +132,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" />
@@ -180,7 +180,7 @@
       <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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,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="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" />
@@ -256,7 +255,7 @@
                       <node concept="2OqwBi" id="4eFGY40pT66" role="3clFbG">
                         <node concept="2OqwBi" id="4eFGY40pT67" role="2Oq$k0">
                           <node concept="37vLTw" id="4eFGY40pT68" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4eFGY40pT6c" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEg7Qt" />
                           </node>
                           <node concept="3TrcHB" id="4eFGY40pT69" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -271,9 +270,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4eFGY40pT6c" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkEg7Qt" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4eFGY40pT6d" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkEg7Qu" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -306,7 +305,7 @@
                       <node concept="2OqwBi" id="4eFGY40pIA9" role="3clFbG">
                         <node concept="2OqwBi" id="4eFGY40pIAa" role="2Oq$k0">
                           <node concept="37vLTw" id="4eFGY40pIAb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4eFGY40pIAf" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEg7Qv" />
                           </node>
                           <node concept="3CFZ6_" id="4eFGY40pIAc" role="2OqNvi">
                             <node concept="3CFYIy" id="4eFGY40pIAd" role="3CFYIz">
@@ -318,9 +317,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4eFGY40pIAf" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkEg7Qv" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4eFGY40pIAg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkEg7Qw" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd
index 03f0964a..848c6582 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.mutant.base" uuid="434ae70d-b732-4ce4-82f0-942388529867" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.mutant.base" uuid="434ae70d-b732-4ce4-82f0-942388529867" 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">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -28,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:73736c50-f124-433b-b789-2828a15a0adc:jetbrains.mps.baseLanguage.collections.trove" 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" />
@@ -54,6 +53,7 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
     <module reference="aaaaf3e2-decf-4e97-bf80-9109eab759ee(jetbrains.mps.lang.feedback.problem.legacy-constraints)" version="0" />
     <module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps
index 55706309..e25813ac 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:54506dde-f39c-4bb7-9de3-58b71ed99507(org.mpsqa.mutant.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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd
index e0a15b6c..81874e36 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.mutant.pluginSolution" uuid="fec26ebc-c695-48d3-a9aa-29d5d68907a9" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="org.mpsqa.mutant.pluginSolution" uuid="fec26ebc-c695-48d3-a9aa-29d5d68907a9" 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:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-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/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps
index e156bfb4..a7f0316d 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps
@@ -26,7 +26,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" />
@@ -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>
     </language>
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd
index 4801ffc3..99cbc118 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.mutant.sandbox" uuid="1e45183e-6744-4d9c-8b26-73b527b88fa2" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.mutant.sandbox" uuid="1e45183e-6744-4d9c-8b26-73b527b88fa2" 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: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/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps
index a45065c0..8bb27868 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps
@@ -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>
     </language>
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps
index 1c61f193..faabcde0 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps
@@ -36,7 +36,7 @@
         <property id="1156234966388" name="shortDescription" index="OYnhT" />
         <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/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps
index 3941f1e1..1c629a7e 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps
@@ -37,7 +37,7 @@
         <property id="1156234966388" name="shortDescription" index="OYnhT" />
         <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/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps
index 5e5cfa52..3388438c 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps
@@ -39,7 +39,7 @@
         <property id="1156234966388" name="shortDescription" index="OYnhT" />
         <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/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps
index 6f6e4c46..dec64819 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps
@@ -37,7 +37,7 @@
         <property id="1156234966388" name="shortDescription" index="OYnhT" />
         <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/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps
index 79d73c5b..f247ee7f 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps
@@ -70,7 +70,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="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>
@@ -120,7 +120,7 @@
       <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.mps
index 8ed2566c..b5d7742f 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.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/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps
index 03557b53..f1e15319 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps
@@ -69,7 +69,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>
@@ -115,7 +115,7 @@
       <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
index 14895f63..c8665af0 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.org.mpsqa.mutant.demolang" uuid="d82f8c3c-f70e-4c29-a624-08519198f5c7" moduleVersion="0" compileInMPS="true">
+<solution name="test.org.mpsqa.mutant.demolang" uuid="d82f8c3c-f70e-4c29-a624-08519198f5c7" 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">3313ed27-e24e-4f1d-81b0-b1b57775ffac(org.mpsqa.mutant.demolang)</dependency>
     <dependency reexport="false">434ae70d-b732-4ce4-82f0-942388529867(org.mpsqa.mutant.base)</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:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/org.mpsqa.testing/.mps/migration.xml b/code/languages/org.mpsqa.testing/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.testing/.mps/migration.xml
+++ b/code/languages/org.mpsqa.testing/.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
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
index d4fbde23..64fb4208 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
@@ -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>
@@ -210,7 +210,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>
@@ -246,7 +246,7 @@
       <concept id="1048903277984099198" name="jetbrains.mps.lang.generator.structure.VarMacro2" flags="lg" index="1ps_y7">
         <child id="1048903277984099213" name="variables" index="1ps_xO" />
       </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" />
@@ -271,6 +271,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 @@
     <language id="bf73e6d8-133f-42d0-a056-6fd1d29d022f" name="org.mpsqa.testcov.buildIntegration.jacoco">
       <concept id="7012081905496477455" name="org.mpsqa.testcov.buildIntegration.jacoco.structure.CoverageOf" flags="ng" index="8g2ho" />
       <concept id="3501904696383148638" name="org.mpsqa.testcov.buildIntegration.jacoco.structure.BuildAspect_MpsTestModulesWithCoverage" flags="ng" index="19Et6q" />
-      <concept id="6264459678549847737" name="org.mpsqa.testcov.buildIntegration.jacoco.structure.ICoverageAspect" flags="ng" index="1flRDq">
+      <concept id="6264459678549847737" name="org.mpsqa.testcov.buildIntegration.jacoco.structure.ICoverageAspect" flags="ngI" index="1flRDq">
         <child id="1149674635298787521" name="coverageOf" index="1rHEoW" />
       </concept>
     </language>
@@ -387,7 +388,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>
@@ -419,7 +420,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="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -592,7 +592,7 @@
                             </node>
                             <node concept="2OqwBi" id="32pgWhTkdxU" role="3uHU7B">
                               <node concept="37vLTw" id="32pgWhTkdhT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="32pgWhTkd9Y" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEkZn5" />
                               </node>
                               <node concept="3TrcHB" id="32pgWhTkdX2" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -601,9 +601,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="32pgWhTkd9Y" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkEkZn5" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="32pgWhTkd9Z" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkEkZn6" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -752,7 +752,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="333OuT0Sge9" role="3uHU7B">
                                           <node concept="37vLTw" id="333OuT0Sgea" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="333OuT0Sgee" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkEkZn7" />
                                           </node>
                                           <node concept="2Xjw5R" id="333OuT0Sgeb" role="2OqNvi">
                                             <node concept="1xMEDy" id="333OuT0Sgec" role="1xVPHs">
@@ -765,9 +765,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="333OuT0Sgee" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkEkZn7" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="333OuT0Sgef" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkEkZn8" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -934,7 +934,7 @@
                                       <node concept="3clFbC" id="333OuT0Sgfg" role="3clFbG">
                                         <node concept="2OqwBi" id="333OuT0Sgfh" role="3uHU7B">
                                           <node concept="37vLTw" id="333OuT0Sgfi" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="333OuT0Sgfn" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkEkZn9" />
                                           </node>
                                           <node concept="2Xjw5R" id="333OuT0Sgfj" role="2OqNvi">
                                             <node concept="1xMEDy" id="333OuT0Sgfk" role="1xVPHs">
@@ -950,9 +950,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="333OuT0Sgfn" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkEkZn9" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="333OuT0Sgfo" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkEkZna" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1095,7 +1095,7 @@
                                   <node concept="3clFbF" id="333OuT0Sgga" role="3cqZAp">
                                     <node concept="2OqwBi" id="333OuT0Sggb" role="3clFbG">
                                       <node concept="37vLTw" id="333OuT0Sggc" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="333OuT0Sgge" resolve="it" />
+                                        <ref role="3cqZAo" node="1vMaDkEkZnb" />
                                       </node>
                                       <node concept="3TrcHB" id="333OuT0Sggd" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1103,9 +1103,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="333OuT0Sgge" role="1bW2Oz">
+                                <node concept="gl6BB" id="1vMaDkEkZnb" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="333OuT0Sggf" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="1vMaDkEkZnc" role="1tU5fm" />
                                 </node>
                               </node>
                               <node concept="1nlBCl" id="333OuT0Sggg" role="2S7zOq">
@@ -1603,7 +1603,7 @@
                                     <node concept="3clFbF" id="333OuT0Sgj8" role="3cqZAp">
                                       <node concept="2OqwBi" id="333OuT0Sgj9" role="3clFbG">
                                         <node concept="37vLTw" id="333OuT0Sgja" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="333OuT0Sgjc" resolve="it" />
+                                          <ref role="3cqZAo" node="1vMaDkEkZnd" />
                                         </node>
                                         <node concept="2qgKlT" id="333OuT0Sgjb" role="2OqNvi">
                                           <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
@@ -1611,9 +1611,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="333OuT0Sgjc" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkEkZnd" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="333OuT0Sgjd" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkEkZne" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1641,7 +1641,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="333OuT0Sgjq" role="3uHU7B">
                                         <node concept="37vLTw" id="333OuT0Sgjr" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="333OuT0Sgjv" resolve="it" />
+                                          <ref role="3cqZAo" node="1vMaDkEkZnf" />
                                         </node>
                                         <node concept="2Xjw5R" id="333OuT0Sgjs" role="2OqNvi">
                                           <node concept="1xMEDy" id="333OuT0Sgjt" role="1xVPHs">
@@ -1654,9 +1654,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="333OuT0Sgjv" role="1bW2Oz">
+                                <node concept="gl6BB" id="1vMaDkEkZnf" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="333OuT0Sgjw" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="1vMaDkEkZng" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1728,7 +1728,7 @@
                                     <node concept="3clFbF" id="333OuT0SgjY" role="3cqZAp">
                                       <node concept="2OqwBi" id="333OuT0SgjZ" role="3clFbG">
                                         <node concept="37vLTw" id="333OuT0Sgk0" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="333OuT0Sgk2" resolve="it" />
+                                          <ref role="3cqZAo" node="1vMaDkEkZnh" />
                                         </node>
                                         <node concept="2qgKlT" id="333OuT0Sgk1" role="2OqNvi">
                                           <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
@@ -1736,9 +1736,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="333OuT0Sgk2" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkEkZnh" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="333OuT0Sgk3" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkEkZni" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1769,7 +1769,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="333OuT0Sgkh" role="3uHU7B">
                                           <node concept="37vLTw" id="333OuT0Sgki" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="333OuT0Sgkm" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkEkZnj" />
                                           </node>
                                           <node concept="2Xjw5R" id="333OuT0Sgkj" role="2OqNvi">
                                             <node concept="1xMEDy" id="333OuT0Sgkk" role="1xVPHs">
@@ -1782,9 +1782,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="333OuT0Sgkm" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkEkZnj" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="333OuT0Sgkn" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkEkZnk" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -3035,7 +3035,7 @@
                                       <node concept="2OqwBi" id="333OuT0Sgs0" role="3clFbG">
                                         <node concept="2OqwBi" id="333OuT0Sgs1" role="2Oq$k0">
                                           <node concept="37vLTw" id="333OuT0Sgs2" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="333OuT0Sgs6" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkEkZnl" />
                                           </node>
                                           <node concept="3TrcHB" id="333OuT0Sgs3" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3050,9 +3050,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="333OuT0Sgs6" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkEkZnl" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="333OuT0Sgs7" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkEkZnm" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -3211,14 +3211,14 @@
                                         <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
                                       </node>
                                       <node concept="37vLTw" id="4F_fjXJZvXD" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3ZNuxuVIKrC" resolve="it" />
+                                        <ref role="3cqZAo" node="1vMaDkEkZnn" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3ZNuxuVIKrC" role="1bW2Oz">
+                                <node concept="gl6BB" id="1vMaDkEkZnn" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3ZNuxuVIKrD" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="1vMaDkEkZno" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -4531,7 +4531,7 @@
                                                 <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                                 <node concept="2OqwBi" id="3NbSlfvYgYz" role="37wK5m">
                                                   <node concept="37vLTw" id="3NbSlfvYgY$" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="3NbSlfvYgYA" resolve="it" />
+                                                    <ref role="3cqZAo" node="1vMaDkEkZnp" />
                                                   </node>
                                                   <node concept="3TrcHB" id="3NbSlfvYgY_" role="2OqNvi">
                                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4541,9 +4541,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="3NbSlfvYgYA" role="1bW2Oz">
+                                        <node concept="gl6BB" id="1vMaDkEkZnp" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="3NbSlfvYgYB" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="1vMaDkEkZnq" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.util.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.util.mps
index bcfce5c3..6dda2cad 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.util.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.util.mps
@@ -44,7 +44,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </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>
@@ -58,13 +58,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/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.behavior.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.behavior.mps
index 7cdbe400..e7bbd88b 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.behavior.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.behavior.mps
@@ -5,7 +5,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <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" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -95,7 +95,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,12 +107,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" />
@@ -159,7 +160,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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 +186,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" />
     </language>
   </registry>
@@ -348,7 +348,7 @@
                   <node concept="3clFbF" id="5rJPecpIbFy" role="3cqZAp">
                     <node concept="2OqwBi" id="5rJPecpIbFz" role="3clFbG">
                       <node concept="37vLTw" id="5rJPecpIbF$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5rJPecpIbFA" resolve="it" />
+                        <ref role="3cqZAo" node="1vMaDkEkZn2" />
                       </node>
                       <node concept="2qgKlT" id="5rJPecpIbF_" role="2OqNvi">
                         <ref role="37wK5l" node="ZOtJPkfDhS" resolve="getModules" />
@@ -356,9 +356,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5rJPecpIbFA" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEkZn2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5rJPecpIbFB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEkZn3" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.constraints.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.constraints.mps
index c550d4c0..2d1b7edc 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.constraints.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.constraints.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>
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.editor.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.editor.mps
index 7ba34751..e43a7573 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.editor.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.editor.mps
@@ -38,7 +38,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" />
@@ -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/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.structure.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.structure.mps
index 58f1f732..f711a6d5 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.structure.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/models/org.mpsqa.testcov.buildIntegration.jacoco.structure.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/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/org.mpsqa.testcov.buildIntegration.jacoco.mpl b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/org.mpsqa.testcov.buildIntegration.jacoco.mpl
index 8098bf47..b99d7af9 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/org.mpsqa.testcov.buildIntegration.jacoco.mpl
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/org.mpsqa.testcov.buildIntegration.jacoco.mpl
@@ -39,7 +39,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" />
@@ -110,7 +110,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0cf935df-4699-4e9c-a132-fa109541cba3(jetbrains.mps.build.mps)</dependency>
     <dependency reexport="false">d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)</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/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/generator/templates/org.mpsqa.testcov.jacoco.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/generator/templates/org.mpsqa.testcov.jacoco.generator.templates@generator.mps
index 720293fd..0634c5a1 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/generator/templates/org.mpsqa.testcov.jacoco.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/generator/templates/org.mpsqa.testcov.jacoco.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/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/models/org.mpsqa.testcov.jacoco.intentions.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/models/org.mpsqa.testcov.jacoco.intentions.mps
index f43ceca9..833696d8 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/models/org.mpsqa.testcov.jacoco.intentions.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/models/org.mpsqa.testcov.jacoco.intentions.mps
@@ -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>
@@ -73,7 +73,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/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/org.mpsqa.testcov.jacoco.mpl b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/org.mpsqa.testcov.jacoco.mpl
index 1ccb8616..1f4e6348 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/org.mpsqa.testcov.jacoco.mpl
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.jacoco/org.mpsqa.testcov.jacoco.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">998f9a96-8397-4ccb-acfb-d98f854aae12(org.mpsqa.testcov.jacoco.rt)</dependency>
@@ -65,7 +64,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.mps
index 3e727b3e..9e2b4aa9 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.mps
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
@@ -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>
@@ -168,7 +168,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">
@@ -205,6 +205,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" />
@@ -226,7 +227,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">
         <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>
@@ -273,7 +274,6 @@
       <concept id="1209727891789" name="jetbrains.mps.baseLanguage.collections.structure.ComparatorSortOperation" flags="nn" index="2DpFxk">
         <child id="1209727996925" name="ascending" index="2Dq5b$" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
     </language>
@@ -1513,7 +1513,7 @@
                       <node concept="2OqwBi" id="5mQCqLmwVHW" role="3clFbG">
                         <node concept="2OqwBi" id="5mQCqLmwVIa" role="2Oq$k0">
                           <node concept="37vLTw" id="5mQCqLmwVIq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5mQCqLmwVGB" resolve="fileA" />
+                            <ref role="3cqZAo" node="1vMaDkEkZnr" />
                           </node>
                           <node concept="liA8E" id="5mQCqLmwVIr" role="2OqNvi">
                             <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
@@ -1523,7 +1523,7 @@
                           <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
                           <node concept="2OqwBi" id="5mQCqLmwVIs" role="37wK5m">
                             <node concept="37vLTw" id="5mQCqLmwVIC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5mQCqLmwVGC" resolve="fileB" />
+                              <ref role="3cqZAo" node="1vMaDkEkZnt" />
                             </node>
                             <node concept="liA8E" id="5mQCqLmwVID" role="2OqNvi">
                               <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
@@ -1533,13 +1533,13 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5mQCqLmwVGB" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkEkZnr" role="1bW2Oz">
                     <property role="TrG5h" value="fileA" />
-                    <node concept="2jxLKc" id="5mQCqLmwVHk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkEkZns" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="5mQCqLmwVGC" role="1bW2Oz">
+                  <node concept="gl6BB" id="1vMaDkEkZnt" role="1bW2Oz">
                     <property role="TrG5h" value="fileB" />
-                    <node concept="2jxLKc" id="5mQCqLmwVHl" role="1tU5fm" />
+                    <node concept="2jxLKc" id="1vMaDkEkZnu" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="5mQCqLmwVFK" role="2Dq5b$">
diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd
index 56341603..8a868235 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.gentest.baseline" uuid="95e21b06-06a6-46fe-b92e-7f5e0f4ceb35" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.gentest.baseline" uuid="95e21b06-06a6-46fe-b92e-7f5e0f4ceb35" 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>
@@ -21,7 +20,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:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <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/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps
index f7b694db..a4a27ab7 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps
@@ -5,7 +5,7 @@
     <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="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" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -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>
@@ -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">
@@ -157,7 +157,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/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.nodes_coverage.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.nodes_coverage.mps
index 9feffc6f..bae1d262 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.nodes_coverage.mps
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.nodes_coverage.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="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <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" />
@@ -166,7 +166,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 +190,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">
@@ -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" />
@@ -255,7 +256,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">
@@ -289,7 +290,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="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -1781,14 +1781,14 @@
                                     <property role="3cmrfH" value="0" />
                                   </node>
                                   <node concept="37vLTw" id="7YpeH5eQPd$" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="7YpeH5eQO3M" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkEkZnv" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7YpeH5eQO3M" role="1bW2Oz">
+                            <node concept="gl6BB" id="1vMaDkEkZnv" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7YpeH5eQO3N" role="1tU5fm" />
+                              <node concept="2jxLKc" id="1vMaDkEkZnw" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1917,15 +1917,15 @@
                                             <property role="3cmrfH" value="0" />
                                           </node>
                                           <node concept="37vLTw" id="7YpeH5eRaKB" role="1LFl5Q">
-                                            <ref role="3cqZAo" node="7YpeH5eRaKC" resolve="it" />
+                                            <ref role="3cqZAo" node="1vMaDkEkZnx" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="7YpeH5eRaKC" role="1bW2Oz">
+                                  <node concept="gl6BB" id="1vMaDkEkZnx" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="7YpeH5eRaKD" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="1vMaDkEkZny" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps
index 2ea0b0fc..c3ee0ddf 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:265216e8-ed17-49d2-8b6b-965998fa502c(org.mpsqa.testcov.jacoco.rt.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" />
@@ -36,6 +36,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" />
@@ -72,7 +73,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 +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>
@@ -146,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>
@@ -154,7 +155,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="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -163,7 +164,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>
@@ -173,7 +174,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>
@@ -269,6 +270,7 @@
     <property role="TrG5h" value="JaCoCo Project Coverage" />
     <property role="2uzpH1" value="Display JaCoCo Tests Coverage for This Project" />
     <property role="1WHSii" value="Display JaCoCo Tests Coverage for This Project" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="584dPWt0gVh" role="tncku">
       <node concept="3clFbS" id="584dPWt0gVi" role="2VODD2">
         <node concept="3cpWs8" id="584dPWt4HlE" role="3cqZAp">
diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps
index 7138ec71..b1af5f3b 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" 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" />
@@ -58,7 +58,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_" />
@@ -157,7 +157,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>
@@ -180,7 +180,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">
@@ -217,6 +217,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" />
@@ -263,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>
@@ -293,7 +294,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="1240424373525" name="jetbrains.mps.baseLanguage.collections.structure.MappingType" flags="in" index="3f3tKP">
         <child id="1240424397093" name="keyType" index="3f3zw5" />
         <child id="1240424402756" name="valueType" index="3f3$T$" />
@@ -596,14 +596,14 @@
                                 <property role="3cmrfH" value="0" />
                               </node>
                               <node concept="37vLTw" id="584dPWt2ekb" role="1LFl5Q">
-                                <ref role="3cqZAo" node="584dPWt2ekc" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEkZnz" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="584dPWt2ekc" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkEkZnz" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="584dPWt2ekd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkEkZn$" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -676,7 +676,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="584dPWt6QA0" role="1LFl5Q">
                                     <node concept="37vLTw" id="584dPWt6QA1" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="584dPWt6QA5" resolve="it" />
+                                      <ref role="3cqZAo" node="1vMaDkEkZn_" />
                                     </node>
                                     <node concept="3AY5_j" id="584dPWt6QA2" role="2OqNvi" />
                                   </node>
@@ -690,9 +690,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="584dPWt6QA5" role="1bW2Oz">
+                          <node concept="gl6BB" id="1vMaDkEkZn_" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="584dPWt6QA6" role="1tU5fm" />
+                            <node concept="2jxLKc" id="1vMaDkEkZnA" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd
index dce303b7..86c5ed20 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.testcov.jacoco.rt" uuid="998f9a96-8397-4ccb-acfb-d98f854aae12" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.mpsqa.testcov.jacoco.rt" uuid="998f9a96-8397-4ccb-acfb-d98f854aae12" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -36,16 +36,13 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/lib/org.jacoco.core-0.8.7.202105040129.jar" />
+      <library location="${module}/lib/lib/org.jacoco.report-0.8.7.202105040129.jar" />
+      <library location="${module}/lib/lib/asm-9.2.jar" />
+      <library location="${module}/lib/lib/asm-tree-9.2.jar" />
+      <library location="${module}/lib/lib/asm-commons-9.2.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/lib/org.jacoco.core-0.8.7.202105040129.jar" />
-    <stubModelEntry path="${module}/lib/lib/org.jacoco.report-0.8.7.202105040129.jar" />
-    <stubModelEntry path="${module}/lib/lib/asm-9.2.jar" />
-    <stubModelEntry path="${module}/lib/lib/asm-tree-9.2.jar" />
-    <stubModelEntry path="${module}/lib/lib/asm-commons-9.2.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>
@@ -62,14 +59,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: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/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd
index 67019f41..bea738a8 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.testcov.jacoco.sandbox" uuid="b16c110c-230e-4d95-a845-113f39565494" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.testcov.jacoco.sandbox" uuid="b16c110c-230e-4d95-a845-113f39565494" 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="b16c110c-230e-4d95-a845-113f39565494(org.mpsqa.testcov.jacoco.sandbox)" version="0" />
diff --git a/code/languages/org.mpsqa.unused/.mps/migration.xml b/code/languages/org.mpsqa.unused/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.unused/.mps/migration.xml
+++ b/code/languages/org.mpsqa.unused/.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
diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/models/org.mpsqa.invisible_models.test_lang.structure.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/models/org.mpsqa.invisible_models.test_lang.structure.mps
index 97aa5baa..ceae321d 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/models/org.mpsqa.invisible_models.test_lang.structure.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/models/org.mpsqa.invisible_models.test_lang.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/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/org.mpsqa.invisible_models.test_lang.mpl b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/org.mpsqa.invisible_models.test_lang.mpl
index fc1906c1..8bf69cfb 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/org.mpsqa.invisible_models.test_lang.mpl
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models.test_lang/org.mpsqa.invisible_models.test_lang.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/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.editor.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.editor.mps
index 53613c36..88f48c79 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.editor.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.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="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps
index d0dd3cdb..f3ee98a9 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps
@@ -118,7 +118,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>
@@ -135,7 +135,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">
@@ -146,6 +146,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" />
@@ -203,7 +204,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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 @@
       <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>
@@ -496,15 +496,15 @@
                             <node concept="3clFbF" id="1aX3ezKycTL" role="3cqZAp">
                               <node concept="2OqwBi" id="1aX3ezKycTM" role="3clFbG">
                                 <node concept="37vLTw" id="1aX3ezKycTN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1aX3ezKycTP" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEiZmR" />
                                 </node>
                                 <node concept="2yIwOk" id="1aX3ezKycTO" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1aX3ezKycTP" role="1bW2Oz">
+                          <node concept="gl6BB" id="1vMaDkEiZmR" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1aX3ezKycTQ" role="1tU5fm" />
+                            <node concept="2jxLKc" id="1vMaDkEiZmS" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -553,7 +553,7 @@
                               <node concept="TSZUe" id="1aX3ezKygU2" role="2OqNvi">
                                 <node concept="1Ls8ON" id="1aX3ezKyh4g" role="25WWJ7">
                                   <node concept="37vLTw" id="1aX3ezKyhHI" role="1Lso8e">
-                                    <ref role="3cqZAo" node="1aX3ezKyf7M" resolve="it" />
+                                    <ref role="3cqZAo" node="1vMaDkEiZmT" />
                                   </node>
                                   <node concept="3cmrfG" id="1aX3ezKyhR2" role="1Lso8e">
                                     <property role="3cmrfH" value="0" />
@@ -563,9 +563,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1aX3ezKyf7M" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkEiZmT" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1aX3ezKyf7N" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkEiZmU" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -599,7 +599,7 @@
                                         <node concept="3clFbC" id="1aX3ezKynwy" role="3clFbG">
                                           <node concept="2OqwBi" id="1aX3ezKynwz" role="3uHU7w">
                                             <node concept="37vLTw" id="1aX3ezKynw$" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="1aX3ezKyj6K" resolve="invisibleNode" />
+                                              <ref role="3cqZAo" node="1vMaDkEiZmX" />
                                             </node>
                                             <node concept="2yIwOk" id="1aX3ezKynw_" role="2OqNvi" />
                                           </node>
@@ -608,15 +608,15 @@
                                               <property role="3cmrfH" value="0" />
                                             </node>
                                             <node concept="37vLTw" id="1aX3ezKynwC" role="1LFl5Q">
-                                              <ref role="3cqZAo" node="1aX3ezKynwD" resolve="it" />
+                                              <ref role="3cqZAo" node="1vMaDkEiZmV" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="1aX3ezKynwD" role="1bW2Oz">
+                                    <node concept="gl6BB" id="1vMaDkEiZmV" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="1aX3ezKynwE" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="1vMaDkEiZmW" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -649,9 +649,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1aX3ezKyj6K" role="1bW2Oz">
+                        <node concept="gl6BB" id="1vMaDkEiZmX" role="1bW2Oz">
                           <property role="TrG5h" value="invisibleNode" />
-                          <node concept="2jxLKc" id="1aX3ezKyj6L" role="1tU5fm" />
+                          <node concept="2jxLKc" id="1vMaDkEiZmY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -672,14 +672,14 @@
                                   <property role="3cmrfH" value="1" />
                                 </node>
                                 <node concept="37vLTw" id="1aX3ezKyxFV" role="1LFl5Q">
-                                  <ref role="3cqZAo" node="1aX3ezKyx_z" resolve="it" />
+                                  <ref role="3cqZAo" node="1vMaDkEiZmZ" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1aX3ezKyx_z" role="1bW2Oz">
+                          <node concept="gl6BB" id="1vMaDkEiZmZ" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1aX3ezKyx_$" role="1tU5fm" />
+                            <node concept="2jxLKc" id="1vMaDkEiZn0" role="1tU5fm" />
                           </node>
                         </node>
                         <node concept="1nlBCl" id="1aX3ezKyygC" role="2S7zOq" />
diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.structure.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.structure.mps
index ef02fabc..89dbf62d 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.structure.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_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/org.mpsqa.unused/languages/org.mpsqa.invisible_models/org.mpsqa.invisible_models.mpl b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/org.mpsqa.invisible_models.mpl
index 78a98754..04cb1af0 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/org.mpsqa.invisible_models.mpl
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/org.mpsqa.invisible_models.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</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: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/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.generator.templates@generator.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.generator.templates@generator.mps
index 017f6496..4d8b18df 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.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/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.behavior.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.behavior.mps
index 4f08b85b..230e6389 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.behavior.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.behavior.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">
@@ -105,7 +105,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>
@@ -118,13 +118,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" />
@@ -166,7 +167,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">
@@ -200,7 +201,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" />
     </language>
   </registry>
@@ -537,15 +537,15 @@
                       </node>
                       <node concept="TSZUe" id="5PcqW5OBIaO" role="2OqNvi">
                         <node concept="37vLTw" id="1YSnQiVjVEC" role="25WWJ7">
-                          <ref role="3cqZAo" node="5PcqW5OBEL5" resolve="it" />
+                          <ref role="3cqZAo" node="1vMaDkEiZn2" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5PcqW5OBEL5" role="1bW2Oz">
+                <node concept="gl6BB" id="1vMaDkEiZn2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5PcqW5OBEL6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="1vMaDkEiZn3" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.editor.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.editor.mps
index 8e906ce3..395a93cc 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.editor.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.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="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -109,7 +109,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/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.mps
index 54122746..2bfd13b2 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.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>
@@ -138,7 +138,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">
@@ -152,6 +152,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" />
@@ -248,7 +249,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -287,7 +288,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="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -427,7 +427,7 @@
                       <node concept="3clFbF" id="5PcqW5OEmjq" role="3cqZAp">
                         <node concept="2OqwBi" id="5PcqW5OEmjr" role="3clFbG">
                           <node concept="37vLTw" id="5PcqW5OEmjs" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5PcqW5OEmju" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEiZn4" />
                           </node>
                           <node concept="liA8E" id="5PcqW5OEmjt" role="2OqNvi">
                             <ref role="37wK5l" to="w1kc:~Language.getConceptDeclarations()" resolve="getConceptDeclarations" />
@@ -435,9 +435,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5PcqW5OEmju" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkEiZn4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5PcqW5OEmjv" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkEiZn5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -685,7 +685,7 @@
                       <node concept="3clFbF" id="1YSnQiVhLcc" role="3cqZAp">
                         <node concept="2OqwBi" id="1YSnQiVhLcd" role="3clFbG">
                           <node concept="37vLTw" id="1YSnQiVhLce" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1YSnQiVhLcg" resolve="it" />
+                            <ref role="3cqZAo" node="1vMaDkEiZn6" />
                           </node>
                           <node concept="liA8E" id="1YSnQiVhLcf" role="2OqNvi">
                             <ref role="37wK5l" to="w1kc:~Language.getConceptDeclarations()" resolve="getConceptDeclarations" />
@@ -693,9 +693,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1YSnQiVhLcg" role="1bW2Oz">
+                    <node concept="gl6BB" id="1vMaDkEiZn6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1YSnQiVhLch" role="1tU5fm" />
+                      <node concept="2jxLKc" id="1vMaDkEiZn7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -837,7 +837,7 @@
                           <node concept="2OqwBi" id="1YSnQiVqeS$" role="3clFbG">
                             <node concept="2OqwBi" id="1YSnQiVqe8N" role="2Oq$k0">
                               <node concept="37vLTw" id="1YSnQiVqdWp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1YSnQiVqdHm" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEiZn8" />
                               </node>
                               <node concept="2yIwOk" id="1YSnQiVqesZ" role="2OqNvi" />
                             </node>
@@ -849,9 +849,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1YSnQiVqdHm" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkEiZn8" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1YSnQiVqdHn" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkEiZn9" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -873,7 +873,7 @@
                           <node concept="2OqwBi" id="1YSnQiVqhop" role="3clFbG">
                             <node concept="2OqwBi" id="1YSnQiVqhoq" role="2Oq$k0">
                               <node concept="37vLTw" id="1YSnQiVqhor" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1YSnQiVqhov" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEiZna" />
                               </node>
                               <node concept="2yIwOk" id="1YSnQiVqhos" role="2OqNvi" />
                             </node>
@@ -885,9 +885,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1YSnQiVqhov" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkEiZna" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1YSnQiVqhow" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkEiZnb" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -909,7 +909,7 @@
                           <node concept="2OqwBi" id="1YSnQiVqhSb" role="3clFbG">
                             <node concept="2OqwBi" id="1YSnQiVqhSc" role="2Oq$k0">
                               <node concept="37vLTw" id="1YSnQiVqhSd" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1YSnQiVqhSh" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEiZnc" />
                               </node>
                               <node concept="2yIwOk" id="1YSnQiVqhSe" role="2OqNvi" />
                             </node>
@@ -921,9 +921,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1YSnQiVqhSh" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkEiZnc" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1YSnQiVqhSi" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkEiZnd" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -945,7 +945,7 @@
                           <node concept="2OqwBi" id="1YSnQiVqhUV" role="3clFbG">
                             <node concept="2OqwBi" id="1YSnQiVqhUW" role="2Oq$k0">
                               <node concept="37vLTw" id="1YSnQiVqhUX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1YSnQiVqhV1" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEiZne" />
                               </node>
                               <node concept="2yIwOk" id="1YSnQiVqhUY" role="2OqNvi" />
                             </node>
@@ -957,9 +957,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1YSnQiVqhV1" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkEiZne" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1YSnQiVqhV2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkEiZnf" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2086,7 +2086,7 @@
                           <node concept="2OqwBi" id="1YSnQiVqxvF" role="3clFbG">
                             <node concept="2OqwBi" id="1YSnQiVqxvG" role="2Oq$k0">
                               <node concept="37vLTw" id="1YSnQiVqxvH" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1YSnQiVqxvL" resolve="it" />
+                                <ref role="3cqZAo" node="1vMaDkEiZng" />
                               </node>
                               <node concept="2yIwOk" id="1YSnQiVqxvI" role="2OqNvi" />
                             </node>
@@ -2098,9 +2098,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1YSnQiVqxvL" role="1bW2Oz">
+                      <node concept="gl6BB" id="1vMaDkEiZng" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1YSnQiVqxvM" role="1tU5fm" />
+                        <node concept="2jxLKc" id="1vMaDkEiZnh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.structure.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.structure.mps
index 7bda916d..2486c0e6 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.structure.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.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/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl
index 12eda2dc..79a65570 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.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">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -70,7 +69,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/models/org.mpsqa.invisible_models.sandbox.smoke.mps b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/models/org.mpsqa.invisible_models.sandbox.smoke.mps
index f18de653..39a265e1 100644
--- a/code/languages/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/models/org.mpsqa.invisible_models.sandbox.smoke.mps
+++ b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/models/org.mpsqa.invisible_models.sandbox.smoke.mps
@@ -17,7 +17,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/org.mpsqa.invisible_models.sandbox.msd b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/org.mpsqa.invisible_models.sandbox.msd
index 63c74dc6..ebc450da 100644
--- a/code/languages/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/org.mpsqa.invisible_models.sandbox.msd
+++ b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.invisible_models.sandbox/org.mpsqa.invisible_models.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.invisible_models.sandbox" uuid="11ca92e5-e287-4854-a6fa-3d8e9abeb6f7" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.invisible_models.sandbox" uuid="11ca92e5-e287-4854-a6fa-3d8e9abeb6f7" 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:f87d0612-ec25-46e5-819a-31e58229407e:org.mpsqa.invisible_models" version="0" />
diff --git a/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/models/org.mpsqa.lancov.sandbox.smoke.mps b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/models/org.mpsqa.lancov.sandbox.smoke.mps
index 34af3ecc..cdca1774 100644
--- a/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/models/org.mpsqa.lancov.sandbox.smoke.mps
+++ b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/models/org.mpsqa.lancov.sandbox.smoke.mps
@@ -33,7 +33,7 @@
       <concept id="6722866822386093835" name="org.mpsqa.lancov.structure.LancovProjectScope" flags="ng" index="DQmja" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/org.mpsqa.lancov.sandbox.msd b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/org.mpsqa.lancov.sandbox.msd
index 17dcbd51..69ffd21d 100644
--- a/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/org.mpsqa.lancov.sandbox.msd
+++ b/code/languages/org.mpsqa.unused/solutions/org.mpsqa.lancov.sandbox/org.mpsqa.lancov.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.mpsqa.lancov.sandbox" uuid="d3311aaf-b6d8-43b0-8b44-2eb0c9599b1e" moduleVersion="0" compileInMPS="true">
+<solution name="org.mpsqa.lancov.sandbox" uuid="d3311aaf-b6d8-43b0-8b44-2eb0c9599b1e" 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">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">002cdcf0-8d3c-425b-9439-321fd2830b63(org.mpsqa.lancov)</dependency>